Changeset 22888 for v6

Timestamp:

11/05/08 20:49:14 (2 months ago)

Author:

ruoso

Message:

[mildew] allow multiple arguments in method calls to preserve the information for those using the capture in slice context...

Location:

v6/mildew

Files:

• mildew (modified) (10 diffs)
• src/AST.pm (modified) (2 diffs)

v6/mildew/mildew

@@ -15 +15 @@
 use Getopt::Long;
 use Carp 'confess';
+use Scalar::Util qw(blessed);
 
 my ($desugar,$debug,$file,$exec);
@@ -41 +42 @@
 }
 
-sub VAST::ws::emit_m0ld {}
+sub VAST::ws::emit_m0ld {
+    my $m = shift;
+    ( map {
+        warn ' extracting '.$_.' from ws ';
+        $m->{$_}->emit_m0ld
+      } grep { blessed $m->{$_} } keys %{$m} ),
+    ( map {
+        warn ' extracting '.ref($_).' from ws ';
+        $_->emit_m0ld
+      } map { @{$m->{$_}} } grep { ref $m->{$_} eq 'ARRAY' } keys %{$m} ),
+}
 
 sub VAST::longname::canonical {
@@ -78 +89 @@
                     ),
                 );
+            } else {
+                XXX;
             }
+        } else {
+            XXX;
         }
     } else {
@@ -121 +136 @@
         if ($name->{morename} and !$name->{identifier}) {
             lookup join '',map {$_->{identifier}[0]{TEXT}} @{$name->{morename}};
-            
-        }
+        } else {
+            XXX;
+        }
+    } else {
+        XXX;
     }
 }
@@ -205 +223 @@
 sub VAST::sublongname::canonical {
     my $m = shift;
+    XXX;
 }
 sub varname {
@@ -227 +246 @@
 sub VAST::Comma::emit_m0ld {
     my $m = shift;
-    map {$_->emit_m0ld} @{$m->{list}};
+    AST::List->new(
+        elements => [ map {$_->emit_m0ld} @{$m->{list}} ]
+    );
 }
 sub VAST::nulltermish::emit_m0ld {
@@ -238 +259 @@
     if (my $methodop = $m->{dottyop}{methodop}) {
         if ($methodop->{longname}) {
-            my $positional = $methodop->{semilist}[0]{statement}[0];
-            my @positional = $positional ? $positional->emit_m0ld : ();
+            my $positional = [ map { map { $_->emit_m0ld } @{$_->{statement}} } @{$methodop->{semilist}} ];
             my $ident = $methodop->{longname}->canonical;
             if ($m->{sym} eq '^!') {
@@ -246 +266 @@
             AST::Call->new(
                 identifier=>string $ident,
-                capture=>AST::Capture->new(invocant=>FETCH($noun),positional=>[@positional]),
+                capture=>AST::Capture->new(invocant=>FETCH($noun),positional=>$positional),
             );
         } else {
@@ -253 +273 @@
     } elsif (my $postop = $m->{dottyop}{postop}) {
         if (my $postcircumfix = $postop->{postcircumfix}) {
-            my $positional = $methodop->{semilist}[0]{statement}[0];
-            my @positional = $positional ? $positional->emit_m0ld : ();
+            my $positional = [ map { map { $_->emit_m0ld } @{$_->{statement}} } @{$methodop->{semilist}} ];
             AST::Call->new(
                 identifier => string 'postcircumfix:'.$postcircumfix->{FIRST}.' '.$postcircumfix->{LAST},
-                capture => AST::Capture->new(invocant=>FETCH($noun),positional=>[@positional]),
+                capture => AST::Capture->new(invocant=>FETCH($noun),positional=>$positional),
             );
         } else {
@@ -294 +313 @@
 sub VAST::Methodcall::emit_m0ld {
     my $m = shift;
-    $m->{arg}->emit_m0ld;
+    $m->{dotty}->emit_m0ld($m->{arg}{noun}->emit_m0ld);
 }
 sub VAST::List_assignment::emit_m0ld {

v6/mildew/src/AST.pm

@@ -1 +1 @@
 {
 package AST;
+use utf8;
 my $id=0;
 sub unique_id {
@@ -94 +95 @@
 has 'identifier';
 has 'stmt';
+
+package AST::List;
+use Moose;
+extends 'AST::Base';
+has 'elements' => (is=>'ro');
+
+sub m0ld {
+    my ($self, $ret) = @_;
+    my @args;
+    my $code;
+    for (@{$self->elements}) {
+        my $id = AST::unique_id();
+        $code .= $_->m0ld($id);
+        push @args, $id;
+    }
+    $code .= 'my '.$ret.' = ?SMOP__S1P__List."new"('.join(',',@args).');'.$/;
+}
 
 package AST::Named;