[svn:parrot] r35814 - in trunk: include/parrot src src/pmc

Author: julianalbo
Date: Tue Jan 20 08:33:48 2009
New Revision: 35814

Modified:
   trunk/include/parrot/packfile.h
   trunk/include/parrot/pic.h
   trunk/src/packout.c
   trunk/src/pic_jit.c
   trunk/src/pmc.c
   trunk/src/pmc/object.pmc
   trunk/src/trace.c
   trunk/src/trace.h

Log:
C++ buildability issues

Modified: trunk/include/parrot/packfile.h
==============================================================================
--- trunk/include/parrot/packfile.h	(original)
+++ trunk/include/parrot/packfile.h	Tue Jan 20 08:33:48 2009
@@ -325,7 +325,7 @@
 PARROT_EXPORT
 int PackFile_find_in_const(PARROT_INTERP,
     ARGIN(const PackFile_ConstTable *ct),
-    ARGIN(const PMC *key),
+    ARGIN(PMC *key),
     int type)
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)

Modified: trunk/include/parrot/pic.h
==============================================================================
--- trunk/include/parrot/pic.h	(original)
+++ trunk/include/parrot/pic.h	Tue Jan 20 08:33:48 2009
@@ -161,7 +161,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 int parrot_pic_is_safe_to_jit(PARROT_INTERP,
-    ARGIN(const PMC *sub),
+    ARGIN(PMC *sub),
     ARGIN(const PMC *sig_args),
     ARGIN(const PMC *sig_results),
     ARGOUT(int *flags))
@@ -172,9 +172,7 @@
         __attribute__nonnull__(5)
         FUNC_MODIFIES(*flags);
 
-funcptr_t parrot_pic_JIT_sub(PARROT_INTERP,
-    ARGIN(const PMC *sub),
-    int flags)
+funcptr_t parrot_pic_JIT_sub(PARROT_INTERP, ARGIN(PMC *sub), int flags)
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 

Modified: trunk/src/packout.c
==============================================================================
--- trunk/src/packout.c	(original)
+++ trunk/src/packout.c	Tue Jan 20 08:33:48 2009
@@ -212,7 +212,7 @@
 PARROT_EXPORT
 int
 PackFile_find_in_const(PARROT_INTERP,
-        ARGIN(const PackFile_ConstTable *ct), ARGIN(const PMC *key), int type)
+        ARGIN(const PackFile_ConstTable *ct), ARGIN(PMC *key), int type)
 {
     ASSERT_ARGS(PackFile_find_in_const)
     int i;

Modified: trunk/src/pic_jit.c
==============================================================================
--- trunk/src/pic_jit.c	(original)
+++ trunk/src/pic_jit.c	Tue Jan 20 08:33:48 2009
@@ -50,7 +50,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 static int call_is_safe(PARROT_INTERP,
-    ARGIN(const PMC *sub),
+    ARGIN(PMC *sub),
     ARGMOD(opcode_t **set_args))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
@@ -58,13 +58,13 @@
         FUNC_MODIFIES(*set_args);
 
 PARROT_WARN_UNUSED_RESULT
-static int jit_can_compile_sub(PARROT_INTERP, ARGIN(const PMC *sub))
+static int jit_can_compile_sub(PARROT_INTERP, ARGIN(PMC *sub))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
 PARROT_WARN_UNUSED_RESULT
 static int ops_jittable(PARROT_INTERP,
-    ARGIN(const PMC *sub),
+    ARGIN(PMC *sub),
     ARGIN(const PMC *sig_results),
     ARGIN(const PackFile_ByteCode *seg),
     ARGIN(opcode_t *pc),
@@ -200,7 +200,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 static int
-jit_can_compile_sub(PARROT_INTERP, ARGIN(const PMC *sub))
+jit_can_compile_sub(PARROT_INTERP, ARGIN(PMC *sub))
 {
     ASSERT_ARGS(jit_can_compile_sub)
     const jit_arch_info * const info = Parrot_jit_init(interp);
@@ -332,7 +332,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 static int
-call_is_safe(PARROT_INTERP, ARGIN(const PMC *sub), ARGMOD(opcode_t **set_args))
+call_is_safe(PARROT_INTERP, ARGIN(PMC *sub), ARGMOD(opcode_t **set_args))
 {
     ASSERT_ARGS(call_is_safe)
     PMC *called, *sig_results;
@@ -383,7 +383,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 static int
-ops_jittable(PARROT_INTERP, ARGIN(const PMC *sub), ARGIN(const PMC *sig_results),
+ops_jittable(PARROT_INTERP, ARGIN(PMC *sub), ARGIN(const PMC *sig_results),
         ARGIN(const PackFile_ByteCode *seg), ARGIN(opcode_t *pc),
         ARGIN(const opcode_t *end), ARGOUT(int *flags))
 {
@@ -459,7 +459,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 int
-parrot_pic_is_safe_to_jit(PARROT_INTERP, ARGIN(const PMC *sub), ARGIN(const PMC *sig_args),
+parrot_pic_is_safe_to_jit(PARROT_INTERP, ARGIN(PMC *sub), ARGIN(const PMC *sig_args),
         ARGIN(const PMC *sig_results), ARGOUT(int *flags))
 {
     ASSERT_ARGS(parrot_pic_is_safe_to_jit)
@@ -523,7 +523,7 @@
 */
 
 funcptr_t
-parrot_pic_JIT_sub(PARROT_INTERP, ARGIN(const PMC *sub), int flags)
+parrot_pic_JIT_sub(PARROT_INTERP, ARGIN(PMC *sub), int flags)
 {
     ASSERT_ARGS(parrot_pic_JIT_sub)
 #ifdef HAS_JIT

Modified: trunk/src/pmc.c
==============================================================================
--- trunk/src/pmc.c	(original)
+++ trunk/src/pmc.c	Tue Jan 20 08:33:48 2009
@@ -521,13 +521,13 @@
 get_new_vtable_index(PARROT_INTERP)
 {
     ASSERT_ARGS(get_new_vtable_index)
-    const INTVAL typeid = interp->n_vtable_max++;
+    const INTVAL type_id = interp->n_vtable_max++;
 
     /* Have we overflowed the table? */
-    if (typeid >= interp->n_vtable_alloced)
+    if (type_id >= interp->n_vtable_alloced)
         parrot_realloc_vtables(interp);
 
-    return typeid;
+    return type_id;
 }
 
 /*

Modified: trunk/src/pmc/object.pmc
==============================================================================
--- trunk/src/pmc/object.pmc	(original)
+++ trunk/src/pmc/object.pmc	Tue Jan 20 08:33:48 2009
@@ -855,8 +855,8 @@
                 classobj, meth_name);
 
         if (!PMC_IS_NULL(method)) {
-            PMC * const class = Parrot_oo_get_class_str(interp, interp->vtables[type]->whoami);
-            Parrot_run_meth_fromc_args(interp, method, SELF, meth_name, "vP", class);
+            PMC * const _class = Parrot_oo_get_class_str(interp, interp->vtables[type]->whoami);
+            Parrot_run_meth_fromc_args(interp, method, SELF, meth_name, "vP", _class);
         }
         else
             SUPER(type);

Modified: trunk/src/trace.c
==============================================================================
--- trunk/src/trace.c	(original)
+++ trunk/src/trace.c	Tue Jan 20 08:33:48 2009
@@ -170,7 +170,7 @@
 */
 
 int
-trace_key_dump(PARROT_INTERP, ARGIN(const PMC *key))
+trace_key_dump(PARROT_INTERP, ARGIN(PMC *key))
 {
     ASSERT_ARGS(trace_key_dump)
     Interp * const debugger = interp->debugger;

Modified: trunk/src/trace.h
==============================================================================
--- trunk/src/trace.h	(original)
+++ trunk/src/trace.h	Tue Jan 20 08:33:48 2009
@@ -18,7 +18,7 @@
 /* HEADERIZER BEGIN: src/trace.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
-int trace_key_dump(PARROT_INTERP, ARGIN(const PMC *key))
+int trace_key_dump(PARROT_INTERP, ARGIN(PMC *key))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 

• [svn:parrot] r35814 - in trunk: include/parrot src src/pmc by julianalbo