file name and line need to be Perl 6 values

rakudo · Dec 1, 2011 · dbee3a0 · dbee3a0
1 parent f961892
commit dbee3a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -54,16 +54,23 @@ class Perl6::Actions is HLL::Actions {
     }
 
     method throw($/, $ex_type, *%opts) {
-        my $file        := pir::find_caller_lex__ps('$?FILES');
-        %opts<line>     := HLL::Compiler.lineof($/.orig, $/.from);
-        %opts<filename> := pir::isnull($file)
-                            ?? '<unknown file>'
-                            !! $file;
         # TODO: provide context
         my $type_found := 1;
-        my $ex      := try { $*ST.find_symbol($ex_type); CATCH { $type_found := 0 } };
+        my $ex := try {
+            CATCH { $type_found := 0 };
+            $*ST.find_symbol($ex_type);
+        };
         if $type_found {
             $ex.new(|%opts).throw;
+            my $file        := pir::find_caller_lex__ps('$?FILES');
+            %opts<line>     := nqp::box_i(
+                HLL::Compiler.lineof($/.orig, $/.from),
+                $*ST.find_symbol(['Int'])
+            );
+            %opts<filename> := nqp::box_s(
+                pir::isnull($file) ?? '<unknown file>' !! $file,
+                $*ST.find_symbol(['Str'])
+            );
         } else {
             my @err := ['Error while compiling, type ', nqp::join('::', $ex_type),  "\n"];
             for %opts -> $key {
@@ -1425,7 +1432,7 @@ class Perl6::Actions is HLL::Actions {
         # Obtain parameters, create signature object and generate code to
         # call binder.
         if $block<placeholder_sig> && $<multisig> {
-            $/.CURSOR.panic('Placeholder variable cannot override existing signature');
+            self.throw($/, ['X', 'Signature', 'Placeholder']);
         }
         my @params :=
                 $<multisig>             ?? $<multisig>[0].ast      !!

diff --git a/src/core/Exceptions.pm b/src/core/Exceptions.pm
@@ -38,12 +38,6 @@ my class X::Buf::AsStr is X::Base {
     }
 }
 
-my role X::Comp {
-    has $.filename;
-    has $.line;
-    has $.column;
-}
-
 my class X::Signature::Placeholder is X::Base does X::Comp {
     method message() {
         'Placeholder variable cannot override existing signature';