Author: jonathan
Date: Sun Apr 15 09:56:33 2007
New Revision: 18224
Modified:
trunk/src/global.c
trunk/src/ops/object.ops
Log:
[PDD15]: Fix a couple of bugs with the get_class_p_p op.
Modified: trunk/src/global.c
==============================================================================
--- trunk/src/global.c (original)
+++ trunk/src/global.c Sun Apr 15 09:56:33 2007
@@ -185,7 +185,8 @@
if (VTABLE_isa(interp, key, string_from_const_cstring(interp, "String",
0)))
base_ns = CONTEXT(interp->ctx)->current_namespace;
else
- base_ns = interp->HLL_namespace;
+ base_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
+ CONTEXT(interp->ctx)->current_HLL);
return Parrot_make_namespace_keyed(interp, base_ns, key);
}
@@ -196,7 +197,8 @@
if (VTABLE_isa(interp, key, string_from_const_cstring(interp, "String",
0)))
base_ns = CONTEXT(interp->ctx)->current_namespace;
else
- base_ns = interp->HLL_namespace;
+ base_ns = VTABLE_get_pmc_keyed_int(interp, interp->HLL_namespace,
+ CONTEXT(interp->ctx)->current_HLL);
return Parrot_get_namespace_keyed(interp, base_ns, key);
}
Modified: trunk/src/ops/object.ops
==============================================================================
--- trunk/src/ops/object.ops (original)
+++ trunk/src/ops/object.ops Sun Apr 15 09:56:33 2007
@@ -430,7 +430,7 @@
* the supplied namespace PMC. */
PMC *ns;
if (!VTABLE_isa(interp, $2, string_from_const_cstring(interp, "NameSpace",
0)))
- ns = Parrot_make_namespace_autobase(interp, $2);
+ ns = Parrot_get_namespace_autobase(interp, $2);
else
ns = $2;