Remove the abstraction 'conditional_expression', be more explicit

bschmalhofer · Feb 22, 2009 · 4d3519a · 4d3519a
1 parent 0640605
commit 4d3519a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 25 deletions.
diff --git a/src/pct/actions.pm b/src/pct/actions.pm
@@ -368,13 +368,6 @@ method argument_list($/) {
     make $past;
 }
 
-method conditional_expression($/) {
-    make PAST::Op.new(
-        :node($/),
-        $( $<expression> ),
-        $( $<block> )
-    );
-}
 
 method do_while_statement($/) {
     make PAST::Op.new(
@@ -386,8 +379,12 @@ method do_while_statement($/) {
 }
 
 method if_statement($/) {
-    my $past := $( $<conditional_expression> );
-    $past.pasttype('if');
+    my $past := PAST::Op.new(
+        :node($/),
+        :pasttype('if'),
+        $( $<expression> ),
+        $( $<block> )
+    );
 
     my $else := undef;
     if +$<else_clause> {
@@ -422,10 +419,12 @@ method if_statement($/) {
 }
 
 method elseif_clause($/) {
-    my $past := $( $<conditional_expression> );
-    $past.pasttype('if');
-
-    make $past;
+    make PAST::Op.new(
+        :node($/),
+        :pasttype('if'),
+        $( $<expression> ),
+        $( $<block> )
+    );
 }
 
 method switch_statement($/) {
@@ -514,10 +513,12 @@ method member($/) {
 }
 
 method while_statement($/) {
-    my $past := $( $<conditional_expression> );
-    $past.pasttype('while');
-
-    make $past;
+    make PAST::Op.new(
+        :node($/),
+        :pasttype('while'),
+        $( $<expression> ),
+        $( $<block> )
+    );
 }
 
 method for_statement($/) {

diff --git a/src/pct/grammar.pg b/src/pct/grammar.pg
@@ -199,13 +199,8 @@ rule argument_list {
     {*}
 }
 
-rule conditional_expression {
-    '(' <expression> ')' <block>
-    {*}
-}
-
 rule if_statement {
-    'if' <conditional_expression>
+    'if' '(' <expression> ')' <block>
     <elseif_clause>*
     <else_clause>?
     {*}
@@ -221,12 +216,12 @@ rule switch_statement {
 }
 
 rule elseif_clause {
-    'elseif' <conditional_expression>
+    'elseif' '(' <expression> ')' <block>
     {*}
 }
 
 rule while_statement {
-    'while' <conditional_expression>
+    'while' '(' <expression> ')' <block>
     {*}
 }