Make sure compose-time errors get line/file.

rakudo · Dec 18, 2015 · c31190e · c31190e
1 parent 48f4c14
commit c31190e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -2526,7 +2526,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
 
             # Compose before we add the role to the group, so the group sees
             # it composed.
-            $*W.pkg_compose($*PACKAGE);
+            $*W.pkg_compose($/, $*PACKAGE);
 
             # Add this role to the group if needed.
             my $group := $*PACKAGE.HOW.group($*PACKAGE);
@@ -2536,7 +2536,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
         }
         else {
             # Compose.
-            $*W.pkg_compose($*PACKAGE);
+            $*W.pkg_compose($/, $*PACKAGE);
 
             # Finish code object for the block.
             my $code := $*CODE_OBJECT;
@@ -4049,7 +4049,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
             }
             # Apply traits, compose and install package.
             $*W.apply_traits($<trait>, $type_obj);
-            $*W.pkg_compose($type_obj);
+            $*W.pkg_compose($/, $type_obj);
         }
         my $base_type;
         my int $has_base_type := 0;

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -304,7 +304,7 @@ class Perl6::World is HLL::World {
         else {
             $*GLOBALish :=
               self.pkg_create_mo($/,%*HOW<package>,:name('GLOBAL'));
-            self.pkg_compose($*GLOBALish);
+            self.pkg_compose($/, $*GLOBALish);
         }
 
         # Create or pull in existing EXPORT.
@@ -314,7 +314,7 @@ class Perl6::World is HLL::World {
         }
         else {
             $*EXPORT := self.pkg_create_mo($/, %*HOW<package>, :name('EXPORT'));
-            self.pkg_compose($*EXPORT);
+            self.pkg_compose($/, $*EXPORT);
         }
 
         # If there's a self in scope, set $*HAS_SELF.
@@ -1137,7 +1137,7 @@ class Perl6::World is HLL::World {
             else {
                 my $new_pkg := self.pkg_create_mo($/, self.resolve_mo($/, 'package'),
                     :name($longname));
-                self.pkg_compose($new_pkg);
+                self.pkg_compose($/, $new_pkg);
                 if $create_scope eq 'my' || $cur_lex {
                     self.install_lexical_symbol($cur_lex, $part, $new_pkg);
                 }
@@ -2669,8 +2669,8 @@ class Perl6::World is HLL::World {
     }
 
     # Composes the package, and stores an event for this action.
-    method pkg_compose($obj) {
-        $obj.HOW.compose($obj);
+    method pkg_compose($/, $obj) {
+        self.ex-handle($/, { $obj.HOW.compose($obj) })
     }
 
     # Builds a curried role based on a parsed argument list.