[svn:parrot] r47036 - in branches/ns_func_cleanup: docs include/parrot src src/ops
whiteknight at svn.parrot.org
whiteknight at svn.parrot.org
Thu May 27 00:10:17 UTC 2010
Author: whiteknight
Date: Thu May 27 00:10:17 2010
New Revision: 47036
URL: https://trac.parrot.org/parrot/changeset/47036
Log:
Parrot_find_global_op -> Parrot_ns_find_global_from_op
Modified:
branches/ns_func_cleanup/docs/embed.pod
branches/ns_func_cleanup/include/parrot/global.h
branches/ns_func_cleanup/src/global.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 Thu May 27 00:05:58 2010 (r47035)
+++ branches/ns_func_cleanup/docs/embed.pod Thu May 27 00:10:17 2010 (r47036)
@@ -715,7 +715,7 @@
=item C<Parrot_ns_find_namespace_global>
-=item C<Parrot_find_global_op>
+=item C<Parrot_ns_find_global_from_op>
=item C<Parrot_find_global_s>
Modified: branches/ns_func_cleanup/include/parrot/global.h
==============================================================================
--- branches/ns_func_cleanup/include/parrot/global.h Thu May 27 00:05:58 2010 (r47035)
+++ branches/ns_func_cleanup/include/parrot/global.h Thu May 27 00:10:17 2010 (r47036)
@@ -34,7 +34,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-PMC * Parrot_find_global_op(PARROT_INTERP,
+PMC * Parrot_ns_find_global_from_op(PARROT_INTERP,
ARGIN(PMC *ns),
ARGIN_NULLOK(STRING *globalname),
ARGIN_NULLOK(void *next))
@@ -148,7 +148,7 @@
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_ns_find_namespace_global __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_find_global_op __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_ns_find_global_from_op __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(ns))
#define ASSERT_ARGS_Parrot_find_global_s __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
Modified: branches/ns_func_cleanup/src/global.c
==============================================================================
--- branches/ns_func_cleanup/src/global.c Thu May 27 00:05:58 2010 (r47035)
+++ branches/ns_func_cleanup/src/global.c Thu May 27 00:10:17 2010 (r47036)
@@ -628,7 +628,7 @@
/*
-=item C<PMC * Parrot_find_global_op(PARROT_INTERP, PMC *ns, STRING *globalname,
+=item C<PMC * Parrot_ns_find_global_from_op(PARROT_INTERP, PMC *ns, STRING *globalname,
void *next)>
If the global exists in the given namespace PMC, return it. If not, return
@@ -642,10 +642,10 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
PMC *
-Parrot_find_global_op(PARROT_INTERP, ARGIN(PMC *ns),
+Parrot_ns_find_global_from_op(PARROT_INTERP, ARGIN(PMC *ns),
ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(void *next))
{
- ASSERT_ARGS(Parrot_find_global_op)
+ ASSERT_ARGS(Parrot_ns_find_global_from_op)
PMC *res;
if (STRING_IS_NULL(globalname))
Modified: branches/ns_func_cleanup/src/ops/core_ops.c
==============================================================================
--- branches/ns_func_cleanup/src/ops/core_ops.c Thu May 27 00:05:58 2010 (r47035)
+++ branches/ns_func_cleanup/src/ops/core_ops.c Thu May 27 00:10:17 2010 (r47036)
@@ -27148,7 +27148,7 @@
Parrot_get_global_p_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const cur_ns = Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp));
- PREG(1) = Parrot_find_global_op(interp, cur_ns, SREG(2),cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, cur_ns, SREG(2),cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27156,7 +27156,7 @@
Parrot_get_global_p_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const cur_ns = Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp));
- PREG(1) = Parrot_find_global_op(interp, cur_ns, CONST(2)->u.string,cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, cur_ns, CONST(2)->u.string,cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27172,7 +27172,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27189,7 +27189,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27206,7 +27206,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27223,7 +27223,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27232,7 +27232,7 @@
Parrot_get_hll_global_p_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
- PREG(1) = Parrot_find_global_op(interp, hll_ns, SREG(2),cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, hll_ns, SREG(2),cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27240,7 +27240,7 @@
Parrot_get_hll_global_p_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
- PREG(1) = Parrot_find_global_op(interp, hll_ns, CONST(2)->u.string,cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, hll_ns, CONST(2)->u.string,cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27256,7 +27256,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27273,7 +27273,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27290,7 +27290,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27307,7 +27307,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27316,7 +27316,7 @@
Parrot_get_root_global_p_s(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const root_ns = interp->root_namespace;
- PREG(1) = Parrot_find_global_op(interp, root_ns, SREG(2),cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, root_ns, SREG(2),cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27324,7 +27324,7 @@
Parrot_get_root_global_p_sc(opcode_t *cur_opcode, PARROT_INTERP) {
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const root_ns = interp->root_namespace;
- PREG(1) = Parrot_find_global_op(interp, root_ns, CONST(2)->u.string,cur_opcode + 3);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, root_ns, CONST(2)->u.string,cur_opcode + 3);
return (opcode_t *)cur_opcode + 3;}
@@ -27339,7 +27339,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27355,7 +27355,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, SREG(3),cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, SREG(3),cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27371,7 +27371,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
@@ -27387,7 +27387,7 @@
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
- PREG(1) = Parrot_find_global_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
+ PREG(1) = Parrot_ns_find_global_from_op(interp, ns, CONST(3)->u.string,cur_opcode + 4);
}
return (opcode_t *)cur_opcode + 4;}
Modified: branches/ns_func_cleanup/src/ops/var.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/var.ops Thu May 27 00:05:58 2010 (r47035)
+++ branches/ns_func_cleanup/src/ops/var.ops Thu May 27 00:10:17 2010 (r47036)
@@ -272,7 +272,7 @@
op get_global(out PMC, in STR) {
PMC * const cur_ns = Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp));
- $1 = Parrot_find_global_op(interp, cur_ns, $2, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, cur_ns, $2, expr NEXT());
}
op get_global(out PMC, in PMC, in STR) {
@@ -285,7 +285,7 @@
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
- $1 = Parrot_find_global_op(interp, ns, $3, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, ns, $3, expr NEXT());
}
}
@@ -304,7 +304,7 @@
op get_hll_global(out PMC, in STR) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
- $1 = Parrot_find_global_op(interp, hll_ns, $2, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, hll_ns, $2, expr NEXT());
}
op get_hll_global(out PMC, in PMC, in STR) {
@@ -317,7 +317,7 @@
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
- $1 = Parrot_find_global_op(interp, ns, $3, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, ns, $3, expr NEXT());
}
}
@@ -336,7 +336,7 @@
op get_root_global(out PMC, in STR) {
PMC * const root_ns = interp->root_namespace;
- $1 = Parrot_find_global_op(interp, root_ns, $2, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, root_ns, $2, expr NEXT());
}
op get_root_global(out PMC, in PMC, in STR) {
@@ -348,7 +348,7 @@
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
- $1 = Parrot_find_global_op(interp, ns, $3, expr NEXT());
+ $1 = Parrot_ns_find_global_from_op(interp, ns, $3, expr NEXT());
}
}
More information about the parrot-commits
mailing list