Make sub_definitions work the way they should in the example compiler.

ekiru · Jul 19, 2010 · 1f22fac · 1f22fac
1 parent a12ad27
commit 1f22fac
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/src/Squaak/Actions.pm b/src/Squaak/Actions.pm
@@ -21,28 +21,14 @@ method statementlist($/) {
 }
 
 method stat_or_def($/) {
-    make $<statement>.ast;
-}
-
-method statement:sym<assignment>($/) {
-    my $lhs := $<primary>.ast;
-    my $rhs := $<expression>.ast;
-    $lhs.lvalue(1);
-    make PAST::Op.new($lhs, $rhs, :pasttype<bind>, :node($/));
-}
-
-method statement:sym<if>($/) {
-    my $cond := $<expression>.ast;
-    my $past := PAST::Op.new( $cond, $<then>.ast,
-                              :pasttype('if'),
-                              :node($/) );
-    if $<else> {
-        $past.push($<else>[0].ast);
+    if $<statement> { 
+        make $<statement>.ast;
+    } else { # Must be a def
+        make $<sub_definition>.ast;
     }
-    make $past;
 }
 
-method statement:sym<sub>($/) {
+method sub_definition($/) {
      our $?BLOCK;
      our @?BLOCK;
      my $past := $<parameters>.ast;
@@ -84,6 +70,25 @@ method parameters($/) {
     make $past;
 }
 
+
+method statement:sym<assignment>($/) {
+    my $lhs := $<primary>.ast;
+    my $rhs := $<expression>.ast;
+    $lhs.lvalue(1);
+    make PAST::Op.new($lhs, $rhs, :pasttype<bind>, :node($/));
+}
+
+method statement:sym<if>($/) {
+    my $cond := $<expression>.ast;
+    my $past := PAST::Op.new( $cond, $<then>.ast,
+                              :pasttype('if'),
+                              :node($/) );
+    if $<else> {
+        $past.push($<else>[0].ast);
+    }
+    make $past;
+}
+
 method statement:sym<throw>($/) {
     make PAST::Op.new( $<expression>.ast,
                        :pirop('throw'),

diff --git a/src/Squaak/Grammar.pm b/src/Squaak/Grammar.pm
@@ -32,6 +32,17 @@ rule statementlist {
 
 rule stat_or_def {
     | <statement>
+    | <sub_definition>
+}
+
+rule sub_definition {
+    'sub' <identifier> <parameters>
+    <statement>*
+    'end'
+}
+
+rule parameters {
+   '(' [<identifier> ** ',']? ')'
 }
 
 proto rule statement { <...> }
@@ -50,16 +61,6 @@ rule statement:sym<if> {
     'end'
 }
 
-rule statement:sym<sub> {
-    <sym> <identifier> <parameters>
-    <statement>*
-    'end'
-}
-
-rule parameters {
-   '(' [<identifier> ** ',']? ')'
-}
-
 rule statement:sym<throw> {
     <sym> <expression>
 }