Changeset 22541

Timestamp:

10/08/08 20:23:05 (6 weeks ago)

Author:

pmurias

Message:

[mildew] added some ast creation helpers, because the Moose constructors are too verbose

Location:

v6/mildew

Files:

• Ast.p6 (deleted)
• mildew (modified) (9 diffs)
• src/AST (added)

v6/mildew/mildew

@@ -5 +5 @@
 use STD;
 use AST;
+use AST::Helpers;
 use DumpMatch;
 use utf8;
@@ -32 +33 @@
     confess 'unimplemented'
 }
-sub integer {
+sub integer_ {
     my $m = shift;
     #XXX non-base 10
-    AST::IntegerConstant->new(value=>$m->text);
+    integer $m->text;
 }
 sub scope_declarator {
@@ -43 +44 @@
             if (my $var_decl = $decl->{variable_declarator}) {
                 AST::Call->new(
-                    identifier => AST::StringConstant->new(value=>'STORE'),
+                    identifier => string 'STORE',
                     capture => AST::Capture->new(
                         invocant => AST::Call->new(
-                            identifier => AST::StringConstant->new(value=>'postcircumfix:{ }'),
-                            capture => AST::Capture->new(invocant=>AST::Reg->new(name=>'scope'),positional=>[AST::StringConstant->new(value=>$m->text)],named=>[])
+                            identifier => string 'postcircumfix:{ }',
+                            capture => AST::Capture->new(invocant=>reg 'scope',positional=>[string $m->text],named=>[])
                         ),
                         positional => [
                             AST::Call->new(
-                                identifier => AST::StringConstant->new(value=>'new'),
-                                invocant => AST::Reg->new(name=>'$Scalar'),
+                                identifier => string 'new',
+                                invocant => reg '$Scalar',
                             )
                         ]
@@ -87 +88 @@
     if ($m->{identifier} && $m->{args}) {
         my $func = AST::Call->new(
-            identifier=>AST::StringConstant->new(value=>'lookup'),
-            capture=>AST::Capture->new(invocant=>AST::Reg->new(name=>'scope'),positional=>[AST::StringConstant->new(value=>'&'.$m->{identifier}->text)],named=>[]),
+            identifier=>string 'lookup',
+            capture=>AST::Capture->new(invocant=>reg 'scope',positional=>[string '&'.$m->{identifier}->text],named=>[]),
         );
-        AST::Call->new(identifier=>AST::StringConstant->new(value=>'postcircumfix:( )'),capture=>AST::Capture->new(invocant=>$func,positional=>args($m->{args})));
+        AST::Call->new(identifier=>string 'postcircumfix:( )',capture=>AST::Capture->new(invocant=>$func,positional=>args($m->{args})));
     }
 }
@@ -99 +100 @@
 sub routine_def {
     my $m = shift;
-    AST::Call->new(identifier=>AST::StringConstant->new(value => 'new'),
+    AST::Call->new(identifier=>string 'new',
         capture => AST::Capture->new(
-            invocant => AST::Reg->new(name=>'Code'),
+            invocant => reg 'Code',
             positional => [],
             named => [
-                AST::StringConstant->new(value=>'mold') => block($m->{block}),
-                AST::StringConstant->new(value=>'outer') => AST::Reg->new(name=>'$scope')
+                string 'mold' => block($m->{block}),
+                string 'outer' => reg '$scope'
             ]
         ),
@@ -130 +131 @@
     #XXX
     my $text = $m->{nibble}->text;
-    AST::StringConstant->new(value=>$text);
+    string $text;
 }
 sub number {
     my $m = shift;
     if ($m->{integer}) {
-        integer($m->{integer});
+        integer_($m->{integer});
     } else {
         XXX;
@@ -143 +144 @@
     my $m = shift;
     AST::Call->new(
-        identifier=>AST::StringConstant->new(value=>'lookup'),
-        capture=>AST::Capture->new(invocant=>AST::Reg->new(name=>'scope'),positional=>[AST::StringConstant->new(value=>$m->text)],named=>[]),
+        identifier=>string 'lookup',
+        capture=>AST::Capture->new(invocant=>reg 'scope',positional=>[string $m->text],named=>[]),
     );
 }
@@ -166 +167 @@
 sub FETCH {
     my $arg = shift;
-    AST::Call->new(capture=>AST::Capture->new(invocant=>$arg),identifier=>AST::StringConstant->new(value=>'FETCH'));
+    AST::Call->new(capture=>AST::Capture->new(invocant=>$arg),identifier=>string 'FETCH');
 }
 sub methodop {
@@ -173 +174 @@
         my $pos0 = $m->{in}[0]{semilist}{statement}[0];
         AST::Call->new(
-            identifier=>AST::StringConstant->new(value=>$m->{longname}->text),
+            identifier=>string $m->{longname}->text,
             capture=>AST::Capture->new(invocant=>FETCH($noun),positional=>[FETCH(EXPR($pos0->{EXPR}))],named=>[]),