[svn:parrot] r47028 - 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 23:04:05 UTC 2010
Author: whiteknight
Date: Wed May 26 23:04:04 2010
New Revision: 47028
URL: https://trac.parrot.org/parrot/changeset/47028
Log:
Parrot_make_namespace_keyed* -> Parrot_ns_make_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/hll.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/var.ops
branches/ns_func_cleanup/src/pmc/class.pmc
branches/ns_func_cleanup/src/pmc/namespace.pmc
branches/ns_func_cleanup/src/pmc/role.pmc
Modified: branches/ns_func_cleanup/docs/embed.pod
==============================================================================
--- branches/ns_func_cleanup/docs/embed.pod Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/docs/embed.pod Wed May 26 23:04:04 2010 (r47028)
@@ -951,9 +951,9 @@
=item C<Parrot_make_namespace_autobase>
-=item C<Parrot_make_namespace_keyed>
+=item C<Parrot_ns_make_namespace_keyed>
-=item C<Parrot_make_namespace_keyed_str>
+=item C<Parrot_ns_make_namespace_keyed_str>
=item C<Parrot_mmd_cache_create>
Modified: branches/ns_func_cleanup/include/parrot/global.h
==============================================================================
--- branches/ns_func_cleanup/include/parrot/global.h Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/include/parrot/global.h Wed May 26 23:04:04 2010 (r47028)
@@ -94,7 +94,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-PMC * Parrot_make_namespace_keyed(PARROT_INTERP,
+PMC * Parrot_ns_make_namespace_keyed(PARROT_INTERP,
ARGIN(PMC *base_ns),
ARGIN(PMC *pmc_key))
__attribute__nonnull__(1)
@@ -104,7 +104,7 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-PMC * Parrot_make_namespace_keyed_str(PARROT_INTERP,
+PMC * Parrot_ns_make_namespace_keyed_str(PARROT_INTERP,
ARGIN(PMC *base_ns),
ARGIN(STRING *str_key))
__attribute__nonnull__(1)
@@ -169,11 +169,11 @@
#define ASSERT_ARGS_Parrot_make_namespace_autobase \
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_make_namespace_keyed __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_ns_make_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_make_namespace_keyed_str \
+#define ASSERT_ARGS_Parrot_ns_make_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:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/global.c Wed May 26 23:04:04 2010 (r47028)
@@ -309,7 +309,7 @@
/*
-=item C<PMC * Parrot_make_namespace_keyed(PARROT_INTERP, PMC *base_ns, PMC
+=item C<PMC * Parrot_ns_make_namespace_keyed(PARROT_INTERP, PMC *base_ns, PMC
*pmc_key)>
Find, or create if necessary, the namespace relative to the namespace
@@ -324,16 +324,16 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC *
-Parrot_make_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns),
+Parrot_ns_make_namespace_keyed(PARROT_INTERP, ARGIN(PMC *base_ns),
ARGIN(PMC *pmc_key))
{
- ASSERT_ARGS(Parrot_make_namespace_keyed)
+ ASSERT_ARGS(Parrot_ns_make_namespace_keyed)
return internal_ns_keyed(interp, base_ns, pmc_key, INTERN_NS_CREAT);
}
/*
-=item C<PMC * Parrot_make_namespace_keyed_str(PARROT_INTERP, PMC *base_ns,
+=item C<PMC * Parrot_ns_make_namespace_keyed_str(PARROT_INTERP, PMC *base_ns,
STRING *str_key)>
Find, or create if necessary, the namespace relative to the namespace
@@ -348,10 +348,10 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
PMC *
-Parrot_make_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
+Parrot_ns_make_namespace_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns),
ARGIN(STRING *str_key))
{
- ASSERT_ARGS(Parrot_make_namespace_keyed_str)
+ ASSERT_ARGS(Parrot_ns_make_namespace_keyed_str)
return internal_ns_keyed_str(interp, base_ns, str_key, INTERN_NS_CREAT);
}
@@ -382,7 +382,7 @@
else
base_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
- return Parrot_make_namespace_keyed(interp, base_ns, key);
+ return Parrot_ns_make_namespace_keyed(interp, base_ns, key);
}
/*
@@ -615,7 +615,7 @@
ARGIN_NULLOK(STRING *globalname), ARGIN_NULLOK(PMC *val))
{
ASSERT_ARGS(Parrot_store_global_s)
- PMC * const ns = Parrot_make_namespace_keyed_str(interp,
+ PMC * const ns = Parrot_ns_make_namespace_keyed_str(interp,
Parrot_get_ctx_HLL_namespace(interp),
str_key);
@@ -733,11 +733,11 @@
return nsroot;
/* If we have a String, do a string lookup */
else if (nsname->vtable->base_type == enum_class_String)
- return Parrot_make_namespace_keyed_str(interp, nsroot,
+ return Parrot_ns_make_namespace_keyed_str(interp, nsroot,
VTABLE_get_string(interp, nsname));
/* Otherwise, do a PMC lookup */
else
- return Parrot_make_namespace_keyed(interp, nsroot, nsname);
+ return Parrot_ns_make_namespace_keyed(interp, nsroot, nsname);
}
/*
Modified: branches/ns_func_cleanup/src/hll.c
==============================================================================
--- branches/ns_func_cleanup/src/hll.c Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/hll.c Wed May 26 23:04:04 2010 (r47028)
@@ -167,7 +167,7 @@
* ns_hash to another type, if mappings provide one
* XXX - FIXME
*/
- ns_hash = Parrot_make_namespace_keyed_str(interp, interp->root_namespace,
+ ns_hash = Parrot_ns_make_namespace_keyed_str(interp, interp->root_namespace,
hll_name);
/* cache HLL's toplevel namespace */
@@ -500,7 +500,7 @@
* here because the typemap already exists, but it is not currently
* done for consistency.
*/
- ns_hash = Parrot_make_namespace_keyed_str(interp,
+ ns_hash = Parrot_ns_make_namespace_keyed_str(interp,
interp->root_namespace, hll_name);
VTABLE_set_pmc_keyed_int(interp, interp->HLL_namespace,
Modified: branches/ns_func_cleanup/src/multidispatch.c
==============================================================================
--- branches/ns_func_cleanup/src/multidispatch.c Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/multidispatch.c Wed May 26 23:04:04 2010 (r47028)
@@ -329,7 +329,7 @@
{
ASSERT_ARGS(Parrot_mmd_find_multi_from_long_sig)
STRING * const multi_str = CONST_STRING(interp, "MULTI");
- PMC * const ns = Parrot_make_namespace_keyed_str(interp,
+ PMC * const ns = Parrot_ns_make_namespace_keyed_str(interp,
interp->root_namespace, multi_str);
PMC * const multi_sub = Parrot_get_global(interp, ns, name);
@@ -896,7 +896,7 @@
{
ASSERT_ARGS(mmd_add_multi_global)
STRING * const multi_str = CONST_STRING(interp, "MULTI");
- PMC * const ns = Parrot_make_namespace_keyed_str(interp,
+ PMC * const ns = Parrot_ns_make_namespace_keyed_str(interp,
interp->root_namespace, multi_str);
PMC *multi_sub = Parrot_get_global(interp, ns, sub_name);
@@ -930,7 +930,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_make_namespace_keyed_str(interp, hll_ns, ns_name);
+ PMC * const ns = Parrot_ns_make_namespace_keyed_str(interp, hll_ns, ns_name);
PMC *multi_sub = Parrot_get_global(interp, ns, sub_name);
if (PMC_IS_NULL(multi_sub)) {
Modified: branches/ns_func_cleanup/src/oo.c
==============================================================================
--- branches/ns_func_cleanup/src/oo.c Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/oo.c Wed May 26 23:04:04 2010 (r47028)
@@ -337,7 +337,7 @@
else {
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,
+ Parrot_ns_make_namespace_keyed_str(interp, parrot_hll,
interp->vtables[type]->whoami);
PMC * proxy = VTABLE_get_class(interp, pmc_ns);
Modified: branches/ns_func_cleanup/src/ops/core_ops.c
==============================================================================
--- branches/ns_func_cleanup/src/ops/core_ops.c Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/ops/core_ops.c Wed May 26 23:04:04 2010 (r47028)
@@ -27412,7 +27412,7 @@
Parrot_set_global_p_s_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_make_namespace_keyed(interp, cur_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, cur_ns, PREG(1));
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27422,7 +27422,7 @@
Parrot_set_global_pc_s_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_make_namespace_keyed(interp, cur_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, cur_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27432,7 +27432,7 @@
Parrot_set_global_p_sc_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_make_namespace_keyed(interp, cur_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, cur_ns, PREG(1));
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
@@ -27442,7 +27442,7 @@
Parrot_set_global_pc_sc_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_make_namespace_keyed(interp, cur_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, cur_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
@@ -27468,7 +27468,7 @@
Parrot_set_hll_global_p_s_p(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);
- PMC * const ns = Parrot_make_namespace_keyed(interp, hll_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PREG(1));
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27478,7 +27478,7 @@
Parrot_set_hll_global_pc_s_p(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);
- PMC * const ns = Parrot_make_namespace_keyed(interp, hll_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27488,7 +27488,7 @@
Parrot_set_hll_global_p_sc_p(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);
- PMC * const ns = Parrot_make_namespace_keyed(interp, hll_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, PREG(1));
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
@@ -27498,7 +27498,7 @@
Parrot_set_hll_global_pc_sc_p(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);
- PMC * const ns = Parrot_make_namespace_keyed(interp, hll_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
@@ -27524,7 +27524,7 @@
Parrot_set_root_global_p_s_p(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;
- PMC * const ns = Parrot_make_namespace_keyed(interp, root_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, root_ns, PREG(1));
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27534,7 +27534,7 @@
Parrot_set_root_global_pc_s_p(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;
- PMC * const ns = Parrot_make_namespace_keyed(interp, root_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, root_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, SREG(2), PREG(3));
@@ -27544,7 +27544,7 @@
Parrot_set_root_global_p_sc_p(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;
- PMC * const ns = Parrot_make_namespace_keyed(interp, root_ns, PREG(1));
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, root_ns, PREG(1));
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
@@ -27554,7 +27554,7 @@
Parrot_set_root_global_pc_sc_p(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;
- PMC * const ns = Parrot_make_namespace_keyed(interp, root_ns, CONST(1)->u.key);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, root_ns, CONST(1)->u.key);
Parrot_set_global(interp, ns, CONST(2)->u.string, PREG(3));
Modified: branches/ns_func_cleanup/src/ops/var.ops
==============================================================================
--- branches/ns_func_cleanup/src/ops/var.ops Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/ops/var.ops Wed May 26 23:04:04 2010 (r47028)
@@ -381,7 +381,7 @@
op set_global(in PMC, in STR, invar PMC) {
PMC * const cur_ns = Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp));
- PMC * const ns = Parrot_make_namespace_keyed(interp, cur_ns, $1);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, cur_ns, $1);
Parrot_set_global(interp, ns, $2, $3);
}
@@ -405,7 +405,7 @@
op set_hll_global(in PMC, in STR, invar PMC) {
PMC * const hll_ns = Parrot_get_ctx_HLL_namespace(interp);
- PMC * const ns = Parrot_make_namespace_keyed(interp, hll_ns, $1);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, hll_ns, $1);
Parrot_set_global(interp, ns, $2, $3);
}
@@ -429,7 +429,7 @@
op set_root_global(in PMC, in STR, invar PMC) {
PMC * const root_ns = interp->root_namespace;
- PMC * const ns = Parrot_make_namespace_keyed(interp, root_ns, $1);
+ PMC * const ns = Parrot_ns_make_namespace_keyed(interp, root_ns, $1);
Parrot_set_global(interp, ns, $2, $3);
}
Modified: branches/ns_func_cleanup/src/pmc/class.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/class.pmc Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/pmc/class.pmc Wed May 26 23:04:04 2010 (r47028)
@@ -284,7 +284,7 @@
else {
PMC * const hll_ns = VTABLE_get_pmc_keyed_int(interp,
interp->HLL_namespace, Parrot_pcc_get_HLL(interp, CURRENT_CONTEXT(interp)));
- new_namespace = Parrot_make_namespace_keyed(interp, hll_ns, name_arg);
+ new_namespace = Parrot_ns_make_namespace_keyed(interp, hll_ns, name_arg);
}
if (PMC_IS_NULL(new_namespace))
@@ -1595,7 +1595,7 @@
/* If the namespace doesn't exist, we create it, and initialize
* ourselves in it */
if (PMC_IS_NULL(ns)) {
- ns = Parrot_make_namespace_keyed(INTERP,
+ ns = Parrot_ns_make_namespace_keyed(INTERP,
INTERP->root_namespace, namespace_array);
SELF.init_pmc(ns);
}
Modified: branches/ns_func_cleanup/src/pmc/namespace.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/namespace.pmc Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/pmc/namespace.pmc Wed May 26 23:04:04 2010 (r47028)
@@ -460,7 +460,7 @@
return;
}
- ns = Parrot_make_namespace_keyed_str(INTERP, ns, part);
+ ns = Parrot_ns_make_namespace_keyed_str(INTERP, ns, part);
}
}
@@ -475,7 +475,7 @@
return;
}
- ns = Parrot_make_namespace_keyed_str(INTERP, ns, part);
+ ns = Parrot_ns_make_namespace_keyed_str(INTERP, ns, part);
}
}
@@ -731,7 +731,7 @@
METHOD make_namespace(PMC *key) {
PMC *ns = Parrot_ns_get_namespace_keyed(INTERP, SELF, key);
if (PMC_IS_NULL(ns)) {
- ns = Parrot_make_namespace_keyed(INTERP, SELF, key);
+ ns = Parrot_ns_make_namespace_keyed(INTERP, SELF, key);
}
RETURN(PMC *ns);
}
Modified: branches/ns_func_cleanup/src/pmc/role.pmc
==============================================================================
--- branches/ns_func_cleanup/src/pmc/role.pmc Wed May 26 22:58:11 2010 (r47027)
+++ branches/ns_func_cleanup/src/pmc/role.pmc Wed May 26 23:04:04 2010 (r47028)
@@ -121,7 +121,7 @@
/* Namespace is nested in the current namespace and with the name of
* the role. */
- role->_namespace = Parrot_make_namespace_keyed_str(interp,
+ role->_namespace = Parrot_ns_make_namespace_keyed_str(interp,
Parrot_pcc_get_namespace(interp, CURRENT_CONTEXT(interp)), role->name);
}
More information about the parrot-commits
mailing list