[svn:parrot] r35733 - trunk/include/parrot

Author: julianalbo
Date: Sun Jan 18 19:45:46 2009
New Revision: 35733

Modified:
   trunk/include/parrot/key.h
   trunk/include/parrot/sub.h

Log:
update headerizing

Modified: trunk/include/parrot/key.h
==============================================================================
--- trunk/include/parrot/key.h	(original)
+++ trunk/include/parrot/key.h	Sun Jan 18 19:45:46 2009
@@ -125,7 +125,8 @@
         FUNC_MODIFIES(*key);
 
 PARROT_EXPORT
-void key_set_number(SHIM_INTERP, ARGMOD(PMC *key), FLOATVAL value)
+void key_set_number(PARROT_INTERP, ARGMOD(PMC *key), FLOATVAL value)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         FUNC_MODIFIES(*key);
 
@@ -202,7 +203,8 @@
 #define ASSERT_ARGS_key_set_integer __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(key)
 #define ASSERT_ARGS_key_set_number __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(key)
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(key)
 #define ASSERT_ARGS_key_set_pmc __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(key) \

Modified: trunk/include/parrot/sub.h
==============================================================================
--- trunk/include/parrot/sub.h	(original)
+++ trunk/include/parrot/sub.h	Sun Jan 18 19:45:46 2009
@@ -277,8 +277,10 @@
 
 PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL
-Parrot_sub * Parrot_get_sub_pmc_from_subclass(PARROT_INTERP, PMC *subclass)
-        __attribute__nonnull__(1);
+Parrot_sub * Parrot_get_sub_pmc_from_subclass(PARROT_INTERP,
+    ARGIN(PMC *subclass))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2);
 
 PARROT_EXPORT
 PARROT_CANNOT_RETURN_NULL
@@ -364,7 +366,8 @@
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_get_sub_pmc_from_subclass \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(subclass)
 #define ASSERT_ARGS_parrot_new_closure __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(sub_pmc)