change some nqp::die's to $*W.throw to get file/line

This also means better testability. There are still a bunch of nqp::die's left.
rakudo · Oct 6, 2015 · 164953b · 164953b
1 parent 02e6198
commit 164953b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -2718,7 +2718,8 @@ Compilation unit '$file' contained the following violations:
                         $U := 1;
                     }
                     else {
-                        nqp::die("Unsupported type smiley '" ~ $_<identifier>.Str ~ "' used in type name");
+                        $*W.throw($/, ['X', 'InvalidTypeSmiley'],
+                            name => $_<identifier>.Str)
                     }
                 }
             }

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -638,7 +638,8 @@ class Perl6::World is HLL::World {
                             self.import($/, self.stash_hash($EXPORT{$tag}), $package_source_name);
                         }
                         else {
-                            nqp::die("Error while importing from '$package_source_name': no such tag '$tag'");
+                            self.throw($/, ['X', 'Import', 'NoSuchTag'],
+                                source-package => $package_source_name, :$tag)
                         }
                     }
                     else {
@@ -667,8 +668,8 @@ class Perl6::World is HLL::World {
             }
             else {
                 if +@positional_imports {
-                    nqp::die("Error while importing from '$package_source_name':
- no EXPORT sub, but you provided positional argument in the 'use' statement");
+                    self.throw($/, ['X', 'Import', 'Positional'],
+                        source-package => $package_source_name)
                 }
             }
         }

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -1885,6 +1885,22 @@ my class X::Import::MissingSymbols is Exception {
     }
 }
 
+my class X::Import::NoSuchTag is Exception {
+    has $.source-package;
+    has $.tag;
+    method message() {
+        "Error while importing from '$.source-package': no such tag '$.tag'"
+    }
+}
+
+my class X::Import::Positional is Exception {
+    has $.source-package;
+    method message() {
+        "Error while importing from '$.source-package':\n"
+        ~ "no EXPORT sub, but you provided positional argument in the 'use' statement"
+    }
+}
+
 my class X::Numeric::Real is Exception {
     has $.target;
     has $.reason;
@@ -2143,6 +2159,13 @@ my class X::InvalidType does X::Comp {
     }
 }
 
+my class X::InvalidTypeSmiley does X::Comp {
+    has $.name;
+    method message() {
+        "Invalid type smiley '$.name' used in type name";
+    }
+}
+
 my class X::Seq::Consumed is Exception {
     method message() {
         "This Seq has already been iterated, and its values consumed"