implement Routine.package

rakudo · Apr 10, 2012 · 8144a04 · 8144a04
1 parent edfd0f2
commit 8144a04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
@@ -565,7 +565,10 @@ BEGIN {
     Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!md_thunk>, :type(Mu), :package(Routine)));
     Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!rw>, :type(int), :package(Routine)));
     Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!inline_info>, :type(str), :package(Routine)));
-    Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!yada>, :type(int), :package(Routine)));Code.HOW.add_method(Code, 'is_dispatcher', static(sub ($self) {
+    Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!yada>, :type(int), :package(Routine)));
+    Routine.HOW.add_attribute(Routine, BOOTSTRAPATTR.new(:name<$!package>, :type(Mu), :package(Routine)));
+
+    Code.HOW.add_method(Code, 'is_dispatcher', static(sub ($self) {
             my $dc_self   := pir::perl6_decontainerize__PP($self);
             my $disp_list := nqp::getattr($dc_self, Routine, '$!dispatchees');
             pir::perl6_booleanize__PI(pir::defined__IP($disp_list));

diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -715,8 +715,10 @@ class Perl6::World is HLL::World {
         }
 
         # If it's a routine, flag that it needs fresh magicals.
+        # Also store the namespace, which makes backtraces nicer.
         if nqp::istype($code, $routine_type) {
             self.get_static_lexpad($code_past).set_fresh_magicals();
+            nqp::bindattr($code, $routine_type, '$!package', $*PACKAGE);
         }
 
         self.add_fixup_task(:deserialize_past($des), :fixup_past($fixups));

diff --git a/src/core/Routine.pm b/src/core/Routine.pm
@@ -95,4 +95,6 @@ my class Routine {
     method yada() {
         nqp::p6bool(nqp::getattr_i(self, Routine, '$!yada'))
     }
+
+    method package() { $!package }
 }