[svn:parrot] r47027 - in branches/ns_func_cleanup: docs include/parrot src src/ops src/pmc
whiteknight at svn.parrot.org
whiteknight at svn.parrot.org
Wed May 26 22:58:12 UTC 2010
Author: whiteknight
Date: Wed May 26 22:58:11 2010
New Revision: 47027
URL: https://trac.parrot.org/parrot/changeset/47027
Log:
Parrot_get_namespace_keyed* -> Parrot_ns_get_namespace_keyed*
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/multidispatch.c
branches/ns_func_cleanup/src/oo.c
branches/ns_func_cleanup/src/ops/core_ops.c
branches/ns_func_cleanup/src/ops/experimental.ops
branches/ns_func_cleanup/src/ops/pmc.ops
branches/ns_func_cleanup/src/ops/var.ops
branches/ns_func_cleanup/src/pmc/capture.pmc
branches/ns_func_cleanup/src/pmc/class.pmc
branches/ns_func_cleanup/src/pmc/namespace.pmc
Modified: branches/ns_func_cleanup/docs/embed.pod
==============================================================================
--- branches/ns_func_cleanup/docs/embed.pod Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/docs/embed.pod Wed May 26 22:58:11 2010 (r47027)
@@ -775,9 +775,9 @@
=item C<Parrot_get_namespace_autobase>
-=item C<Parrot_get_namespace_keyed>
+=item C<Parrot_ns_get_namespace_keyed>
-=item C<Parrot_get_namespace_keyed_str>
+=item C<Parrot_ns_get_namespace_keyed_str>
=item C<Parrot_get_numreg>
Modified: branches/ns_func_cleanup/include/parrot/global.h
==============================================================================
--- branches/ns_func_cleanup/include/parrot/global.h Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/include/parrot/global.h Wed May 26 22:58:11 2010 (r47027)
@@ -69,7 +69,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-PMC * Parrot_get_namespace_keyed(PARROT_INTERP,
+PMC * Parrot_ns_get_namespace_keyed(PARROT_INTERP,
ARGIN(PMC *base_ns),
ARGIN(PMC *pmc_key))
__attribute__nonnull__(1)
@@ -79,7 +79,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-PMC * Parrot_get_namespace_keyed_str(PARROT_INTERP,
+PMC * Parrot_ns_get_namespace_keyed_str(PARROT_INTERP,
ARGIN(PMC *base_ns),
ARGIN_NULLOK(STRING *str_key))
__attribute__nonnull__(1)
@@ -158,11 +158,11 @@
, PARROT_ASSERT_ARG(name))
#define ASSERT_ARGS_Parrot_get_global __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_get_namespace_keyed __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_ns_get_namespace_keyed __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(base_ns) \
, PARROT_ASSERT_ARG(pmc_key))
-#define ASSERT_ARGS_Parrot_get_namespace_keyed_str \
+#define ASSERT_ARGS_Parrot_ns_get_namespace_keyed_str \
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(base_ns))
Modified: branches/ns_func_cleanup/src/global.c
==============================================================================
--- branches/ns_func_cleanup/src/global.c Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/global.c Wed May 26 22:58:11 2010 (r47027)
@@ -263,7 +263,7 @@
/*
-=item C<PMC * Parrot_get_namespace_keyed(PARROT_INTERP, PMC *base_ns, PMC
+=item C<PMC * Parrot_ns_get_namespace_keyed(PARROT_INTERP, PMC *base_ns, PMC
*pmc_key)>
Find the namespace relative to the namespace C<base_ns> with the key
@@ -278,15 +278,15 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC *
-Parrot_get_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns), ARGIN(PMC *pmc_key))
+Parrot_ns_get_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns), ARGIN(PMC *pmc_key))
{
- ASSERT_ARGS(Parrot_get_namespace_keyed)
+ ASSERT_ARGS(Parrot_ns_get_namespace_keyed)
return internal_ns_keyed(interp, base_ns, pmc_key, 0);
}
/*
-=item C<PMC * Parrot_get_namespace_keyed_str(PARROT_INTERP, PMC *base_ns, STRING
+=item C<PMC * Parrot_ns_get_namespace_keyed_str(PARROT_INTERP, PMC *base_ns, STRING
*str_key)>
Find the namespace relative to the namespace C<base_ns> with the string key
@@ -300,10 +300,10 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC *
-Parrot_get_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
+Parrot_ns_get_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
ARGIN_NULLOK(STRING *str_key))
{
- ASSERT_ARGS(Parrot_get_namespace_keyed_str)
+ ASSERT_ARGS(Parrot_ns_get_namespace_keyed_str)
return internal_ns_keyed_str(interp, base_ns, str_key, 0);
}
@@ -563,7 +563,7 @@
{
ASSERT_ARGS(Parrot_find_global_s)
PMC *const ns =
- Parrot_get_namespace_keyed_str(interp,
+ Parrot_ns_get_namespace_keyed_str(interp,
Parrot_get_ctx_HLL_namespace(interp),
str_key);
return Parrot_find_global_n(interp, ns, globalname);
Modified: branches/ns_func_cleanup/src/multidispatch.c
==============================================================================
--- branches/ns_func_cleanup/src/multidispatch.c Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/multidispatch.c Wed May 26 22:58:11 2010 (r47027)
@@ -868,7 +868,7 @@
{
ASSERT_ARGS(mmd_search_global)
STRING * const multi_str = CONST_STRING(interp, "MULTI");
- PMC * const ns = Parrot_get_namespace_keyed_str(interp,
+ PMC * const ns = Parrot_ns_get_namespace_keyed_str(interp,
interp->root_namespace, multi_str);
PMC *multi_sub = Parrot_get_global(interp, ns, name);
Modified: branches/ns_func_cleanup/src/oo.c
==============================================================================
--- branches/ns_func_cleanup/src/oo.c Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/oo.c Wed May 26 22:58:11 2010 (r47027)
@@ -190,7 +190,7 @@
PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp,
interp->HLL_namespace,
Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
- PMC * const ns = Parrot_get_namespace_keyed(interp,
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp,
hll_ns, key);
if (!PMC_IS_NULL(ns))
@@ -335,7 +335,7 @@
return type_class;
}
else {
- PMC * const parrot_hll = Parrot_get_namespace_keyed_str(interp, interp->root_namespace, CONST_STRING(interp, "parrot"));
+ PMC * const parrot_hll = Parrot_ns_get_namespace_keyed_str(interp, interp->root_namespace, CONST_STRING(interp, "parrot"));
PMC * const pmc_ns =
Parrot_make_namespace_keyed_str(interp, parrot_hll,
interp->vtables[type]->whoami);
@@ -376,7 +376,7 @@
/* First check in current HLL namespace */
PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
- PMC * const ns = Parrot_get_namespace_keyed_str(interp, hll_ns, name);
+ PMC * const ns = Parrot_ns_get_namespace_keyed_str(interp, hll_ns, name);
PMC * const _class = PMC_IS_NULL(ns)
? PMCNULL : VTABLE_get_class(interp, ns);
Modified: branches/ns_func_cleanup/src/ops/core_ops.c
==============================================================================
--- branches/ns_func_cleanup/src/ops/core_ops.c Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/ops/core_ops.c Wed May 26 22:58:11 2010 (r47027)
@@ -23924,7 +23924,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = PREG(2);
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -23944,7 +23944,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = CONST(2)->u.key;
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -23964,7 +23964,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = PREG(2);
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -23984,7 +23984,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = CONST(2)->u.key;
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -24004,7 +24004,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = PREG(2);
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -24024,7 +24024,7 @@
const Parrot_Context * const CUR_CTX = Parrot_pcc_get_context_struct(interp, interp->ctx);
PMC * const key = CONST(2)->u.key;
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -27060,7 +27060,7 @@
Parrot_get_namespace_p_p(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));
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, PREG(2));
PREG(1) = PMC_IS_NULL(ns) ? PMCNULL : ns;
@@ -27070,7 +27070,7 @@
Parrot_get_namespace_p_pc(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));
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
PREG(1) = PMC_IS_NULL(ns) ? PMCNULL : ns;
@@ -27091,7 +27091,7 @@
if (PMC_IS_NULL(hll_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, PREG(2));
PREG(1) = ns;
}
@@ -27104,7 +27104,7 @@
if (PMC_IS_NULL(hll_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
PREG(1) = ns;
}
@@ -27125,7 +27125,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, PREG(2));
PREG(1) = ns;
}
@@ -27138,7 +27138,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
PREG(1) = ns;
}
@@ -27168,7 +27168,7 @@
PREG(1) = PMCNULL;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27185,7 +27185,7 @@
PREG(1) = PMCNULL;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27202,7 +27202,7 @@
PREG(1) = PMCNULL;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27219,7 +27219,7 @@
PREG(1) = PMCNULL;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27252,7 +27252,7 @@
PREG(1) = hll_ns;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27269,7 +27269,7 @@
PREG(1) = hll_ns;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27286,7 +27286,7 @@
PREG(1) = hll_ns;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27303,7 +27303,7 @@
PREG(1) = hll_ns;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27335,7 +27335,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27351,7 +27351,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27367,7 +27367,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, PREG(2));
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, PREG(2));
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -27383,7 +27383,7 @@
if (PMC_IS_NULL(root_ns))
PREG(1) = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, CONST(2)->u.key);
if (PMC_IS_NULL(ns))
PREG(1) = PMCNULL;
else
@@ -29012,7 +29012,7 @@
/* if it's clearly a PIR-level PMC */
if (type > enum_class_core_max) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, name_key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, name_key);
PMC * const _class = Parrot_oo_get_class(interp, ns);
if (!PMC_IS_NULL(_class)) {
PMC *initial = Parrot_pmc_new(interp,
@@ -29046,7 +29046,7 @@
/* if it's clearly a PIR-level PMC */
if (type > enum_class_core_max) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, name_key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, name_key);
PMC * const _class = Parrot_oo_get_class(interp, ns);
if (!PMC_IS_NULL(_class)) {
PMC *initial = Parrot_pmc_new(interp,
@@ -29080,7 +29080,7 @@
/* if it's clearly a PIR-level PMC */
if (type > enum_class_core_max) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, name_key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, name_key);
PMC * const _class = Parrot_oo_get_class(interp, ns);
if (!PMC_IS_NULL(_class)) {
PMC *initial = Parrot_pmc_new(interp,
@@ -29114,7 +29114,7 @@
/* if it's clearly a PIR-level PMC */
if (type > enum_class_core_max) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, name_key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, name_key);
PMC * const _class = Parrot_oo_get_class(interp, ns);
if (!PMC_IS_NULL(_class)) {
PMC *initial = Parrot_pmc_new(interp,
Modified: branches/ns_func_cleanup/src/ops/experimental.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/experimental.ops Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/ops/experimental.ops Wed May 26 22:58:11 2010 (r47027)
@@ -323,7 +323,7 @@
/* if it's clearly a PIR-level PMC */
if (type > enum_class_core_max) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, name_key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, name_key);
PMC * const _class = Parrot_oo_get_class(interp, ns);
if (!PMC_IS_NULL(_class)) {
PMC *initial = Parrot_pmc_new(interp,
Modified: branches/ns_func_cleanup/src/ops/pmc.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/pmc.ops Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/ops/pmc.ops Wed May 26 22:58:11 2010 (r47027)
@@ -143,7 +143,7 @@
op root_new(out PMC, in PMC) {
PMC * const key = $2;
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
@@ -161,7 +161,7 @@
op root_new(out PMC, in PMC, in PMC) {
PMC * const key = $2;
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, key);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, key);
PMC * classobj = PMCNULL;
if (!PMC_IS_NULL(ns))
Modified: branches/ns_func_cleanup/src/ops/var.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/var.ops Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/ops/var.ops Wed May 26 22:58:11 2010 (r47027)
@@ -189,7 +189,7 @@
op get_namespace(out PMC, in PMC) {
PMC * const cur_ns = Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp));
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, $2);
$1 = PMC_IS_NULL(ns) ? PMCNULL : ns;
}
@@ -216,7 +216,7 @@
if (PMC_IS_NULL(hll_ns))
$1 = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, $2);
$1 = ns;
}
}
@@ -242,7 +242,7 @@
if (PMC_IS_NULL(root_ns))
$1 = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, $2);
$1 = ns;
}
}
@@ -281,7 +281,7 @@
$1 = PMCNULL;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, cur_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, cur_ns, $2);
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
@@ -313,7 +313,7 @@
$1 = hll_ns;
}
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, hll_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, hll_ns, $2);
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
@@ -344,7 +344,7 @@
if (PMC_IS_NULL(root_ns))
$1 = PMCNULL;
else {
- PMC * const ns = Parrot_get_namespace_keyed(interp, root_ns, $2);
+ PMC * const ns = Parrot_ns_get_namespace_keyed(interp, root_ns, $2);
if (PMC_IS_NULL(ns))
$1 = PMCNULL;
else
Modified: branches/ns_func_cleanup/src/pmc/capture.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/capture.pmc Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/pmc/capture.pmc Wed May 26 22:58:11 2010 (r47027)
@@ -855,8 +855,8 @@
PMC *ns = INTERP->root_namespace;
STRING *attribute = CONST_STRING(INTERP, "proxy");
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, CONST_STRING(INTERP, "parrot"));
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, CONST_STRING(INTERP, "Capture"));
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, CONST_STRING(INTERP, "parrot"));
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, CONST_STRING(INTERP, "Capture"));
classobj = Parrot_oo_get_class(INTERP, ns);
capt = VTABLE_get_attr_keyed(INTERP, SELF, classobj, attribute);
}
Modified: branches/ns_func_cleanup/src/pmc/class.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/class.pmc Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/pmc/class.pmc Wed May 26 22:58:11 2010 (r47027)
@@ -1589,7 +1589,7 @@
STRING * const semicolon_str = CONST_STRING(INTERP, ";");
PMC * const namespace_array =
Parrot_str_split(INTERP, semicolon_str, serial_namespace);
- PMC *ns = Parrot_get_namespace_keyed(INTERP,
+ PMC *ns = Parrot_ns_get_namespace_keyed(INTERP,
INTERP->root_namespace, namespace_array);
/* If the namespace doesn't exist, we create it, and initialize
Modified: branches/ns_func_cleanup/src/pmc/namespace.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/namespace.pmc Wed May 26 22:49:28 2010 (r47026)
+++ branches/ns_func_cleanup/src/pmc/namespace.pmc Wed May 26 22:58:11 2010 (r47027)
@@ -515,7 +515,7 @@
if (!key)
return VTABLE_get_pmc_keyed_str(INTERP, ns, part);
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, part);
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, part);
if (PMC_IS_NULL(ns))
return PMCNULL;
@@ -531,14 +531,14 @@
/* What to do here? Throw an exception or something? */
break;
}
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, name);
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, name);
++i;
}
return ns;
}
else {
STRING * const name = VTABLE_get_string(INTERP, key);
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, name);
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, name);
return ns;
}
/* If we get the wrong type, should we throw an exception?
@@ -605,7 +605,7 @@
if (!key)
return VTABLE_get_pointer_keyed_str(INTERP, ns, part);
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, part);
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, part);
if (PMC_IS_NULL(ns))
return PMCNULL;
@@ -621,7 +621,7 @@
if ((i + 1) >= elements)
return VTABLE_get_pointer_keyed_str(INTERP, ns, part);
- ns = Parrot_get_namespace_keyed_str(INTERP, ns, part);
+ ns = Parrot_ns_get_namespace_keyed_str(INTERP, ns, part);
if (PMC_IS_NULL(ns))
return PMCNULL;
@@ -729,7 +729,7 @@
*/
METHOD make_namespace(PMC *key) {
- PMC *ns = Parrot_get_namespace_keyed(INTERP, SELF, key);
+ PMC *ns = Parrot_ns_get_namespace_keyed(INTERP, SELF, key);
if (PMC_IS_NULL(ns)) {
ns = Parrot_make_namespace_keyed(INTERP, SELF, key);
}
More information about the parrot-commits
mailing list