typed exceptions for several uncaught control exceptions

rakudo · May 27, 2012 · 9452bf6 · 9452bf6
1 parent 5c9c02d
commit 9452bf6
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -1,4 +1,5 @@
 my role X::Comp { ... }
+my class X::ControlFlow { ... }
 
 my class Exception {
     has $!ex;
@@ -154,23 +155,23 @@ do {
             die("stray return control exception");
         }
         if ($type == pir::const::CONTROL_LOOP_LAST) {
-            die("last without loop construct");
+            X::ControlFlow.new(illegal => 'last', enclosing => 'loop construct').throw;
         }
         if ($type == pir::const::CONTROL_LOOP_NEXT) {
-            die("next without loop construct");
+            X::ControlFlow.new(illegal => 'next', enclosing => 'loop construct').throw;
         }
         if ($type == pir::const::CONTROL_LOOP_REDO) {
-            die("redo without loop construct");
+            X::ControlFlow.new(illegal => 'redo', enclosing => 'loop construct').throw;
         }
         if ($type == pir::const::CONTROL_CONTINUE) {
-            die("proceed without when clause");
+            X::ControlFlow.new(illegal => 'proceed', enclosing => 'when clause').throw;
         }
         if ($type == pir::const::CONTROL_BREAK) {
             # XXX: should work like leave() ?
-            die("succeed without when clause");
+            X::ControlFlow.new(illegal => 'succeed', enclosing => 'when clause').throw;
         }
         if ($type == pir::const::CONTROL_TAKE) {
-            die("stray take statement");
+            X::ControlFlow.new(illegal => 'take', enclosing => 'gather').throw;
         }
     }