Changeset 21573 for perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/StatementControl.pm

Timestamp:

07/27/08 17:44:55 (6 months ago)

Author:

fglock

Message:

[v6.pm] fixed 'if'

Files:

• perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/StatementControl.pm (modified) (3 diffs)

perl5/Pugs-Compiler-Perl6/lib/Pugs/Grammar/StatementControl.pm

@@ -190 +190 @@
         ) );
     __PACKAGE__->add_rule(
+        'else' =>  q( 
+            { die "bare 'else'" }
+        ) );
+    __PACKAGE__->add_rule(
         'if' =>  q( 
             <?ws> 
@@ -201 +205 @@
                     exp1 => $_[0]{exp1}->(),
                     exp2 => $_[0]{exp2}->(),
-                    exp3 => [ $_[0]{exp3}->() ],
-                } }
-        |
-            <?ws>? elsif <?ws>? 
-            $<exp3> := <Pugs::Grammar::Expression.parse('no_blocks',0)> <?ws>?
-            $<exp4> := <Pugs::Grammar::Perl6.block>
+                    else => $_[0]{exp3}->(),
+                } }
+        |
+            [
+                <?ws>? elsif <?ws>? 
+                $<exp3> := <Pugs::Grammar::Expression.parse('no_blocks',0)> <?ws>?
+                $<exp4> := <Pugs::Grammar::Perl6.block>
+            ]+
+            
             [
                 <?ws>? else <?ws>? 
@@ -214 +221 @@
                     exp1 => $_[0]{exp1}->(),
                     exp2 => $_[0]{exp2}->(),
-                    exp3 => [ [ $_[0]{exp3}->(), $_[0]{exp4}->() ],
-                              $_[0]{exp5}->() ],
-                } }
-                
-                # TODO: elsif ...
-            |
-                { return { 
-                    statement => 'if',
-                    exp1 => $_[0]{exp1}->(),
-                    exp2 => $_[0]{exp2}->(),
-                    exp3 => [ [$_[0]{exp3}->(), $_[0]{exp4}->() ] ],
+                    elsif => [ $_[0]{exp3}, $_[0]{exp4} ],
+                    else => $_[0]{exp5}->(),
+                } }
+            |
+                { return { 
+                    statement => 'if',
+                    exp1 => $_[0]{exp1}->(),
+                    exp2 => $_[0]{exp2}->(),
+                    elsif => [ $_[0]{exp3}, $_[0]{exp4} ],
                 } }
             ]