Author: mdiep
Date: Mon Mar 5 20:01:01 2007
New Revision: 17364
Modified:
trunk/compilers/imcc/pbc.c
trunk/include/parrot/sub.h
trunk/src/global.c
trunk/src/pmc/sub.pmc
trunk/src/sub.c
Log:
[core]:
Rename the namespace member of the Parrot_sub struct to namespace_name to
more accurately reflect what it cantains.
Modified: trunk/compilers/imcc/pbc.c
==============================================================================
--- trunk/compilers/imcc/pbc.c (original)
+++ trunk/compilers/imcc/pbc.c Mon Mar 5 20:01:01 2007
@@ -708,7 +708,7 @@
break;
}
}
- sub->namespace = ns_pmc;
+ sub->namespace_name = ns_pmc;
sub->start_offs = offs;
sub->end_offs = end;
sub->HLL_id = CONTEXT(interp->ctx)->current_HLL;
Modified: trunk/include/parrot/sub.h
==============================================================================
--- trunk/include/parrot/sub.h (original)
+++ trunk/include/parrot/sub.h Mon Mar 5 20:01:01 2007
@@ -121,7 +121,7 @@
size_t end_offs;
INTVAL HLL_id; /* see src/hll.c XXX or per segment? */
- PMC *namespace; /* where this Sub is in - this is either
+ PMC *namespace_name; /* where this Sub is in - this is either
* a String or a [Key] and describes
* the relative path in the NameSpace
*/
Modified: trunk/src/global.c
==============================================================================
--- trunk/src/global.c (original)
+++ trunk/src/global.c Mon Mar 5 20:01:01 2007
@@ -452,7 +452,7 @@
static PMC *
get_namespace_pmc(Parrot_Interp interp, PMC *sub)
{
- PMC *nsname = PMC_sub(sub)->namespace;
+ PMC *nsname = PMC_sub(sub)->namespace_name;
PMC *nsroot = Parrot_get_HLL_namespace(interp, PMC_sub(sub)->HLL_id);
/* If we have a NULL, return the HLL namespace */
@@ -513,7 +513,7 @@
/* store other subs (as long as they're not :anon) */
else if (!(PObj_get_FLAGS(sub) & SUB_FLAG_PF_ANON)) {
STRING *name = PMC_sub(sub)->name;
- PMC *nsname = PMC_sub(sub)->namespace;
+ PMC *nsname = PMC_sub(sub)->namespace_name;
Parrot_store_global_n(interp, ns, name, sub);
Modified: trunk/src/pmc/sub.pmc
==============================================================================
--- trunk/src/pmc/sub.pmc (original)
+++ trunk/src/pmc/sub.pmc Mon Mar 5 20:01:01 2007
@@ -391,8 +391,8 @@
return;
if (sub->name)
pobject_lives(INTERP, (PObj *) sub->name);
- if (!PMC_IS_NULL(sub->namespace))
- pobject_lives(INTERP, (PObj *) sub->namespace);
+ if (!PMC_IS_NULL(sub->namespace_name))
+ pobject_lives(INTERP, (PObj *) sub->namespace_name);
if (!PMC_IS_NULL(sub->multi_signature))
pobject_lives(INTERP, (PObj *) sub->multi_signature);
if (!PMC_IS_NULL(sub->eval_pmc))
@@ -432,8 +432,8 @@
void visit(visit_info *info) {
struct Parrot_sub * const sub = PMC_sub(SELF);
- info->thaw_ptr = &sub->namespace;
- (info->visit_pmc_now)(INTERP, sub->namespace, info);
+ info->thaw_ptr = &sub->namespace_name;
+ (info->visit_pmc_now)(INTERP, sub->namespace_name, info);
info->thaw_ptr = &sub->multi_signature;
(info->visit_pmc_now)(INTERP, sub->multi_signature, info);
info->thaw_ptr = &sub->outer_sub;
Modified: trunk/src/sub.c
==============================================================================
--- trunk/src/sub.c (original)
+++ trunk/src/sub.c Mon Mar 5 20:01:01 2007
@@ -336,12 +336,12 @@
info->subname = sub->name;
/* set the namespace name and fullname of the sub */
- if (PMC_IS_NULL(sub->namespace)) {
+ if (PMC_IS_NULL(sub->namespace_name)) {
info->nsname = string_from_cstring(interp, "", 0);
info->fullname = info->subname;
}
else {
- info->nsname = VTABLE_get_string(interp, sub->namespace);
+ info->nsname = VTABLE_get_string(interp, sub->namespace_name);
info->fullname = Parrot_full_sub_name(interp, ctx->current_sub);
}
