extract payload from parrot excetions, if available

rakudo · Aug 3, 2011 · 69e9988 · 69e9988
1 parent 8ea619d
commit 69e9988
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -14,8 +14,9 @@ my class Exception {
 }
 
 sub EXCEPTION(|$) {
-    my $ex := nqp::create(Exception);
-    nqp::bindattr($ex, Exception, '$!ex', 
-        nqp::shift(pir::perl6_current_args_rpa__P()));
+    my Mu $parrot_ex := nqp::shift(pir::perl6_current_args_rpa__P());
+    my Mu $payload   := nqp::atkey($parrot_ex, 'payload');
+    my $ex := pir::defined($payload) ?? $payload !! nqp::create(Exception);
+    nqp::bindattr($ex, Exception, '$!ex', $parrot_ex);
     $ex;
 }