Merge branch 'master' of git@github.com:rakudo/rakudo

rakudo · Jul 1, 2009 · 3d94ef4 · 3d94ef4
2 parents 59d2b7a + 468c021
commit 3d94ef4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/perl6.pir b/perl6.pir
@@ -214,7 +214,7 @@ and report exceptions.
     .get_results (exception)
     $I0 = exception['severity']
     if $I0 == .EXCEPT_EXIT goto exit
-    if $I0 != .EXCEPT_WARNING goto not_warning
+    if $I0 > .EXCEPT_WARNING goto not_warning
     printerr exception
     printerr "\n"
     $P0 = exception["resume"]

diff --git a/src/builtins/control.pir b/src/builtins/control.pir
@@ -85,6 +85,7 @@ the moment -- we'll do more complex handling a bit later.)
     $P0         = root_new ['parrot';'Exception']
     $P0['type'] = .CONTROL_TAKE
     $P0['severity'] = .EXCEPT_NORMAL
+    $P0['message'] = 'take without gather'
     setattribute $P0, 'payload', value
     throw $P0
     .return (value)