[svn:parrot] r39487 - in trunk: include/parrot src

[petdance at svn.parrot.org]

Author: petdance
Date: Wed Jun 10 06:16:46 2009
New Revision: 39487
URL: https://trac.parrot.org/parrot/changeset/39487

Log:
reheaderized, and added PARROT_OBSERVER decorations

Modified:
   trunk/include/parrot/oo.h
   trunk/include/parrot/pmc.h
   trunk/src/debug.c

Modified: trunk/include/parrot/oo.h
==============================================================================
--- trunk/include/parrot/oo.h	Wed Jun 10 05:54:27 2009	(r39486)
+++ trunk/include/parrot/oo.h	Wed Jun 10 06:16:46 2009	(r39487)
@@ -133,13 +133,13 @@
 
 PARROT_CANNOT_RETURN_NULL
 PMC * Parrot_oo_clone_object(PARROT_INTERP,
-    ARGIN(PMC * pmc),
-    ARGMOD_NULLOK(PMC * class_),
-    ARGMOD_NULLOK(PMC * dest))
+    ARGIN(PMC *pmc),
+    ARGMOD_NULLOK(PMC *class_),
+    ARGMOD_NULLOK(PMC *dest))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
-        FUNC_MODIFIES(* class_)
-        FUNC_MODIFIES(* dest);
+        FUNC_MODIFIES(*class_)
+        FUNC_MODIFIES(*dest);
 
 void Parrot_oo_extract_methods_from_namespace(PARROT_INTERP,
     ARGIN(PMC *self),

Modified: trunk/include/parrot/pmc.h
==============================================================================
--- trunk/include/parrot/pmc.h	Wed Jun 10 05:54:27 2009	(r39486)
+++ trunk/include/parrot/pmc.h	Wed Jun 10 06:16:46 2009	(r39487)
@@ -88,13 +88,13 @@
 PARROT_CANNOT_RETURN_NULL
 PARROT_IGNORABLE_RESULT
 PMC * pmc_reuse_by_class(PARROT_INTERP,
-    ARGMOD(PMC * pmc),
-    ARGIN(PMC * class_),
+    ARGMOD(PMC *pmc),
+    ARGIN(PMC *class_),
     UINTVAL flags)
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
-        FUNC_MODIFIES(* pmc);
+        FUNC_MODIFIES(*pmc);
 
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT

Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c	Wed Jun 10 05:54:27 2009	(r39486)
+++ trunk/src/debug.c	Wed Jun 10 06:16:46 2009	(r39487)
@@ -80,12 +80,14 @@
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
+PARROT_OBSERVER
 static const char* GDB_P(PARROT_INTERP, ARGIN(const char *s))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
+PARROT_OBSERVER
 static const char* GDB_print_reg(PARROT_INTERP, int t, int n)
         __attribute__nonnull__(1);
 
@@ -388,8 +390,8 @@
 
 struct DebuggerCmd {
     debugger_func_t func;
-    const char * const shorthelp;
-    const char * const help;
+    PARROT_OBSERVER const char * const shorthelp;
+    PARROT_OBSERVER const char * const help;
 };
 
 static const DebuggerCmd
@@ -541,9 +543,9 @@
     };
 
 struct DebuggerCmdList {
-    const char * const name;
+    PARROT_OBSERVER const char * const name;
     char shortname;
-    const DebuggerCmd * const cmd;
+    PARROT_OBSERVER const DebuggerCmd * const cmd;
 };
 
 DebuggerCmdList DebCmdList [] = {
@@ -2730,14 +2732,14 @@
     if (specialop > 0) {
         char buf[1000];
         PMC * const sig = interp->code->const_table->constants[op[1]]->u.key;
-        int n_values = VTABLE_elements(interp, sig);
+        const int n_values = VTABLE_elements(interp, sig);
         /* The flag_names strings come from Call_bits_enum_t (with which it
            should probably be colocated); they name the bits from LSB to MSB.
            The two least significant bits are not flags; they are the register
            type, which is decoded elsewhere.  We also want to show unused bits,
            which could indicate problems.
         */
-        const char * const flag_names[] = {
+        PARROT_OBSERVER const char * const flag_names[] = {
                                      "",
                                      "",
                                      " :unused004",
@@ -2753,7 +2755,7 @@
 
 
         /* Register decoding.  It would be good to abstract this, too. */
-        static const char regs[] = "ISPN";
+        PARROT_OBSERVER static const char regs[] = "ISPN";
 
         for (j = 0; j < n_values; j++) {
             size_t idx = 0;
@@ -3548,6 +3550,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
+PARROT_OBSERVER
 static const char*
 GDB_print_reg(PARROT_INTERP, int t, int n)
 {
@@ -3587,6 +3590,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_CANNOT_RETURN_NULL
+PARROT_OBSERVER
 static const char*
 GDB_P(PARROT_INTERP, ARGIN(const char *s))
 {