Initial fix to allow fail() to work in subs with return type constrai…

…nts. Will need review when we handle lower-cased types, or maybe if we can move ACCEPTS from P6object into Rakudo now after the release and tweak it to do the right thing. Anyway, it's a working solution for now.
rakudo · Aug 19, 2009 · 0bc70da · 0bc70da
1 parent 352acd2
commit 0bc70da
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -3195,14 +3195,23 @@ sub return_handler_past() {
                 PAST::Var.new( :name('exception'), :scope('register') )
             ),
             PAST::Op.new(
-                :pasttype('call'),
-                :name('die'),
+                :pasttype('if'),
+                PAST::Op.new( :inline("    $I0 = isa exception, 'Failure'",
+                                      "    %r = box $I0") ),
+                PAST::Op.new(
+                    :inline('    .return (%0)'),
+                    PAST::Var.new( :name('exception'), :scope('register') )
+                ),
                 PAST::Op.new(
                     :pasttype('call'),
-                    :name('!make_type_fail_message'),
-                    'Return value',
-                    PAST::Var.new( :name('exception'), :scope('register') ),
-                    PAST::Var.new( :name('$P0'), :scope('register') )
+                    :name('die'),
+                    PAST::Op.new(
+                        :pasttype('call'),
+                        :name('!make_type_fail_message'),
+                        'Return value',
+                        PAST::Var.new( :name('exception'), :scope('register') ),
+                        PAST::Var.new( :name('$P0'), :scope('register') )
+                    )
                 )
             )
         )