[svn:parrot] r40769 - in branches/context_pmc3: include/parrot src

[bacek at svn.parrot.org]

Author: bacek
Date: Mon Aug 24 22:48:02 2009
New Revision: 40769
URL: https://trac.parrot.org/parrot/changeset/40769

Log:
Relax checks for namespace in Parrot_cx_set_namespace.

Modified:
   branches/context_pmc3/include/parrot/context.h
   branches/context_pmc3/src/context.c

Modified: branches/context_pmc3/include/parrot/context.h
==============================================================================
--- branches/context_pmc3/include/parrot/context.h	Mon Aug 24 22:12:42 2009	(r40768)
+++ branches/context_pmc3/include/parrot/context.h	Mon Aug 24 22:48:02 2009	(r40769)
@@ -129,10 +129,9 @@
 PARROT_EXPORT
 void Parrot_cx_set_namespace(PARROT_INTERP,
     ARGIN(PMC *ctx),
-    ARGIN(PMC *_namespace))
+    ARGIN_NULLOK(PMC *_namespace))
         __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3);
+        __attribute__nonnull__(2);
 
 #define ASSERT_ARGS_Parrot_cx_constants __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
@@ -166,8 +165,7 @@
     || PARROT_ASSERT_ARG(caller_ctx)
 #define ASSERT_ARGS_Parrot_cx_set_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
-    || PARROT_ASSERT_ARG(ctx) \
-    || PARROT_ASSERT_ARG(_namespace)
+    || PARROT_ASSERT_ARG(ctx)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: src/context.c */
 

Modified: branches/context_pmc3/src/context.c
==============================================================================
--- branches/context_pmc3/src/context.c	Mon Aug 24 22:12:42 2009	(r40768)
+++ branches/context_pmc3/src/context.c	Mon Aug 24 22:48:02 2009	(r40769)
@@ -135,7 +135,7 @@
 
 /*
 
-=item C<INTVAL Parrot_cx_inc_recursion_depth(PARROT_INTERP, PMC *ctx)>
+=item C<UINTVAL Parrot_cx_inc_recursion_depth(PARROT_INTERP, PMC *ctx)>
 
 Increase recurtion depth. Returns new recursion_depth value.
 
@@ -242,7 +242,7 @@
 
 PARROT_EXPORT
 void
-Parrot_cx_set_namespace(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN(PMC *_namespace))
+Parrot_cx_set_namespace(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *_namespace))
 {
     ASSERT_ARGS(Parrot_cx_set_namespace)
     Parrot_Context *c = Parrot_cx_get_context(interp, ctx);