[svn:parrot] r47076 - in branches/ns_func_cleanup: docs include/parrot src src/ops

whiteknight at svn.parrot.org whiteknight at svn.parrot.org
Fri May 28 00:53:54 UTC 2010


Author: whiteknight
Date: Fri May 28 00:53:53 2010
New Revision: 47076
URL: https://trac.parrot.org/parrot/changeset/47076

Log:
Parrot_find_name_op -> Parrot_ns_find_named_item

Modified:
   branches/ns_func_cleanup/docs/embed.pod
   branches/ns_func_cleanup/include/parrot/namespace.h
   branches/ns_func_cleanup/src/namespace.c
   branches/ns_func_cleanup/src/ops/core_ops.c
   branches/ns_func_cleanup/src/ops/var.ops

Modified: branches/ns_func_cleanup/docs/embed.pod
==============================================================================
--- branches/ns_func_cleanup/docs/embed.pod	Fri May 28 00:49:09 2010	(r47075)
+++ branches/ns_func_cleanup/docs/embed.pod	Fri May 28 00:53:53 2010	(r47076)
@@ -725,7 +725,7 @@
 
 =item C<Parrot_find_method_with_cache>
 
-=item C<Parrot_find_name_op>
+=item C<Parrot_ns_find_named_item>
 
 =item C<Parrot_float_rand>
 

Modified: branches/ns_func_cleanup/include/parrot/namespace.h
==============================================================================
--- branches/ns_func_cleanup/include/parrot/namespace.h	Fri May 28 00:49:09 2010	(r47075)
+++ branches/ns_func_cleanup/include/parrot/namespace.h	Fri May 28 00:53:53 2010	(r47076)
@@ -52,7 +52,7 @@
 PARROT_EXPORT
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
-PMC * Parrot_find_name_op(PARROT_INTERP,
+PMC * Parrot_ns_find_named_item(PARROT_INTERP,
     ARGIN(STRING *name),
     SHIM(void *next))
         __attribute__nonnull__(1)
@@ -153,7 +153,7 @@
     , PARROT_ASSERT_ARG(ns))
 #define ASSERT_ARGS_Parrot_find_global_s __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_find_name_op __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_ns_find_named_item __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(name))
 #define ASSERT_ARGS_Parrot_ns_get_global __attribute__unused__ int _ASSERT_ARGS_CHECK = (\

Modified: branches/ns_func_cleanup/src/namespace.c
==============================================================================
--- branches/ns_func_cleanup/src/namespace.c	Fri May 28 00:49:09 2010	(r47075)
+++ branches/ns_func_cleanup/src/namespace.c	Fri May 28 00:53:53 2010	(r47076)
@@ -689,7 +689,7 @@
 void *next)>
 
 If the global exists in the given namespace PMC, return it.  If not, return
-PMCNULL.
+PMCNULL. Throw an exception if a NULL name is passed.
 
 =cut
 
@@ -717,7 +717,7 @@
 
 /*
 
-=item C<PMC * Parrot_find_name_op(PARROT_INTERP, STRING *name, void *next)>
+=item C<PMC * Parrot_ns_find_named_item(PARROT_INTERP, STRING *name, void *next)>
 
 TT #1223 - THIS IS BROKEN - it doesn't walk up the scopes yet
 
@@ -733,9 +733,9 @@
 PARROT_WARN_UNUSED_RESULT
 PARROT_CAN_RETURN_NULL
 PMC *
-Parrot_find_name_op(PARROT_INTERP, ARGIN(STRING *name), SHIM(void *next))
+Parrot_ns_find_named_item(PARROT_INTERP, ARGIN(STRING *name), SHIM(void *next))
 {
-    ASSERT_ARGS(Parrot_find_name_op)
+    ASSERT_ARGS(Parrot_ns_find_named_item)
     PMC * const ctx     = CURRENT_CONTEXT(interp);
     PMC * const lex_pad = Parrot_find_pad(interp, name, ctx);
     PMC * g = PMCNULL;

Modified: branches/ns_func_cleanup/src/ops/core_ops.c
==============================================================================
--- branches/ns_func_cleanup/src/ops/core_ops.c	Fri May 28 00:49:09 2010	(r47075)
+++ branches/ns_func_cleanup/src/ops/core_ops.c	Fri May 28 00:53:53 2010	(r47076)
@@ -27569,7 +27569,7 @@
                 "Tried to find null name");return (opcode_t *)handler;
     }
 
-    PREG(1) = Parrot_find_name_op(interp, SREG(2),cur_opcode + 3);
+    PREG(1) = Parrot_ns_find_named_item(interp, SREG(2),cur_opcode + 3);
 
 return (opcode_t *)cur_opcode + 3;}
 
@@ -27582,7 +27582,7 @@
                 "Tried to find null name");return (opcode_t *)handler;
     }
 
-    PREG(1) = Parrot_find_name_op(interp, CONST(2)->u.string,cur_opcode + 3);
+    PREG(1) = Parrot_ns_find_named_item(interp, CONST(2)->u.string,cur_opcode + 3);
 
 return (opcode_t *)cur_opcode + 3;}
 
@@ -27590,7 +27590,7 @@
 Parrot_find_sub_not_null_p_s(opcode_t *cur_opcode, PARROT_INTERP)  {
     const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
     opcode_t *dest =cur_opcode + 3;
-    PMC *sub = Parrot_find_name_op(interp, SREG(2), dest);
+    PMC *sub = Parrot_ns_find_named_item(interp, SREG(2), dest);
 
     if (PMC_IS_NULL(sub)) {
         opcode_t *handler = Parrot_ex_throw_from_op_args(interp, dest,
@@ -27606,7 +27606,7 @@
 Parrot_find_sub_not_null_p_sc(opcode_t *cur_opcode, PARROT_INTERP)  {
     const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
     opcode_t *dest =cur_opcode + 3;
-    PMC *sub = Parrot_find_name_op(interp, CONST(2)->u.string, dest);
+    PMC *sub = Parrot_ns_find_named_item(interp, CONST(2)->u.string, dest);
 
     if (PMC_IS_NULL(sub)) {
         opcode_t *handler = Parrot_ex_throw_from_op_args(interp, dest,

Modified: branches/ns_func_cleanup/src/ops/var.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/var.ops	Fri May 28 00:49:09 2010	(r47075)
+++ branches/ns_func_cleanup/src/ops/var.ops	Fri May 28 00:53:53 2010	(r47076)
@@ -467,7 +467,7 @@
         goto ADDRESS(handler);
     }
 
-    $1 = Parrot_find_name_op(interp, $2, expr NEXT());
+    $1 = Parrot_ns_find_named_item(interp, $2, expr NEXT());
 }
 
 =item B<find_sub_not_null>(out PMC, in STR)
@@ -479,7 +479,7 @@
 
 inline op find_sub_not_null(out PMC, in STR) :base_core {
     opcode_t *dest = expr NEXT();
-    PMC *sub = Parrot_find_name_op(interp, $2, dest);
+    PMC *sub = Parrot_ns_find_named_item(interp, $2, dest);
 
     if (PMC_IS_NULL(sub)) {
         opcode_t *handler = Parrot_ex_throw_from_op_args(interp, dest,


More information about the parrot-commits mailing list