Changeset 10025

Timestamp:

04/18/06 18:42:09 (3 years ago)

Author:

fglock

Message:

PG-P6 - the AST nodes are more regular

Location:

misc/pX/Common

Files:

• Pugs-Compiler-Precedence/lib/Pugs/Grammar/Precedence.pm (modified) (2 diffs)
• Pugs-Grammar-Perl6/lib/Pugs/Grammar/Expression.pm (modified) (1 diff)
• Pugs-Grammar-Perl6/lib/Pugs/Grammar/Infix.pm (modified) (1 diff)
• Pugs-Grammar-Perl6/lib/Pugs/Grammar/Operator.pm (modified) (1 diff)
• Pugs-Grammar-Perl6/lib/Pugs/Grammar/Prefix.pm (modified) (1 diff)
• Pugs-Grammar-Perl6/test.pl (modified) (1 diff)

misc/pX/Common/Pugs-Compiler-Precedence/lib/Pugs/Grammar/Precedence.pm

@@ -35 +35 @@
     postfix_non =>       
         "exp 'name'         \n" .
-        "\t{ \$_[0]->{out}= {op1 => 'name', exp1 => \$_[1],} }", 
+        "\t{ \$_[0]->{out}= {op1 => \$_[2], exp1 => \$_[1],} }", 
     postcircumfix_non => 
         "exp 'name' exp 'name2' \n" .
@@ -41 +41 @@
     infix_left =>        
         "exp 'name' exp     \n" .
-        "\t{ \$_[0]->{out}= {op1 => 'name', exp1 => \$_[1], exp2 => \$_[3],} }", 
+        "\t{ \$_[0]->{out}= {op1 => \$_[2], exp1 => \$_[1], exp2 => \$_[3],} }", 
     infix_non =>         
         "exp 'name' exp     \n" .
-        "\t{ \$_[0]->{out}= {op1 => 'name', exp1 => \$_[1], exp2 => \$_[3],} }", 
+        "\t{ \$_[0]->{out}= {op1 => \$_[2], exp1 => \$_[1], exp2 => \$_[3],} }", 
     ternary_non =>       
         "exp 'name' exp 'name2' exp \n" .

misc/pX/Common/Pugs-Grammar-Perl6/lib/Pugs/Grammar/Expression.pm

@@ -117 +117 @@
         my $t;
         if ( exists $ast->{stmt} ) {
-            $t = [ $ast->{stmt} => $ast ]
+
+            if ( $ast->{stmt} eq 'if' or $ast->{stmt} eq 'unless' ) {
+                $t = [ 'IF' => $ast ]
+            }
+            else {
+                $t = [ $ast->{stmt} => $ast ]
+            }
         }
         elsif ( exists $ast->{op} ) {

misc/pX/Common/Pugs-Grammar-Perl6/lib/Pugs/Grammar/Infix.pm

@@ -191 +191 @@
     );
 
-    __PACKAGE__->add_rule( 
-        name => 'if',
+    # experimental
+    __PACKAGE__->add_rule( 
+        name => 'IF',
         assoc => 'non',
         precedence => 'tighter',

misc/pX/Common/Pugs-Grammar-Perl6/lib/Pugs/Grammar/Operator.pm

@@ -31 +31 @@
 
 stmt:  
-      'if' exp '{' exp '}' 
-        { $_[0]->{out}= { 'if' => { exp => $_[2], then => $_[4] } } }
-    | 'if' exp '{' exp '}' else '{' exp '}'
-        { $_[0]->{out}= { 'if' => { exp => $_[2], then => $_[4], else => $_[8] } } }
-        
-    | exp 'if' exp 
-        { $_[0]->{out}= { 'if' => { exp => $_[3], then => $_[1], } } }
+      IF exp '{' exp '}' 
+        { $_[0]->{out}= { op1 => $_[1], exp1 => $_[2], exp2 => $_[4] } }
+    | IF exp '{' exp '}' 'else' '{' exp '}'
+        { $_[0]->{out}= { op1 => $_[1], exp1 => $_[2], exp2 => $_[4], exp3 => $_[8] } }
 
-    | 'unless' exp '{' exp '}' 
-        { $_[0]->{out}= { 'unless' => { exp => $_[2], then => $_[4] } } }
-    | 'unless' exp '{' exp '}' else '{' exp '}'
-        { $_[0]->{out}= { 'unless' => { exp => $_[2], then => $_[4], else => $_[8] } } }
-        
     | 'for' exp '{' exp '}'
-        { $_[0]->{out}= { 'for' => { exp => $_[2], block => $_[4], } } }
+        { $_[0]->{out}= { op1 => $_[1], exp1 => $_[2], exp2 => $_[4], } }
         
     | 'sub' BAREWORD             attr '{' exp '}' 

misc/pX/Common/Pugs-Grammar-Perl6/lib/Pugs/Grammar/Prefix.pm

@@ -111 +111 @@
         assoc => 'non',
         precedence => 'equal',
-        other => 'infix:<if>',
+        other => 'infix:<IF>',
     );
 

misc/pX/Common/Pugs-Grammar-Perl6/test.pl

@@ -84 +84 @@
 my $x = do 1 if 2;
 
+say(3 if 4);    # wrong?
+(4 if 5) + (6 if 7);   # wrong?
+
+#1 if 2 if 3;
+
 1;
 PERL6