Changeset 22887 for v6

Timestamp:

11/05/08 19:13:11 (2 months ago)

Author:

ruoso

Message:

[mildew] avoid using globals during ->m0ld().

Location:

v6/mildew

Files:

• mildew (modified) (1 diff)
• src/AST.pm (modified) (5 diffs)

v6/mildew/mildew

@@ -362 +362 @@
 print $mold->pretty,"\n" if $desugar;
 exit if $desugar;
-my $m0ld = <<'BOILERPLATE'.$mold->emit_('$main').<<'CALL_MAIN';
+my $m0ld = <<'BOILERPLATE'.$mold->m0ld('$main').<<'CALL_MAIN';
 my $void;
 BOILERPLATE

v6/mildew/src/AST.pm

@@ -22 +22 @@
     my $self = shift;
     my $id = AST::unique_id;
-    $AST::CODE .= do {local $AST::CODE='';$AST::CODE . $self->m0ld($id)};
-    return $id;
-
-}
-sub emit_ {
-    local $AST::CODE = '';
-    my ($self,$ret) = @_;
-    my $mold = $self->m0ld($ret);
-    $AST::CODE . $mold;
+    return $self->m0ld($id);
+
 }
 sub pretty {
@@ -52 +45 @@
     my $then = $self->then->m0ld($id_then);
 
-    $cond.$/.
+    $cond.
     'my '.$id_cond.'_val = '.$id_cond.'."FETCH"();'.$/.
     'my '.$id_cond.'_bool = '.$id_cond.'_val."bool"();'.$/.
@@ -70 +63 @@
     "my $ret = mold {\n"
         . join('',map {'my $'.$_.";\n"} @{$self->regs})
-        . join("",map { $_->emit_('$void') } @{$self->stmts})
+        . join("",map { $_->m0ld('$void') } @{$self->stmts})
     . "};\n";
 }
@@ -138 +131 @@
     my ($self,$ret) = @_;
     if ($self->capture->isa("AST::Capture")) {
-        "my $ret = "
-        . $self->capture->invocant->emit
-        . "." . $self->identifier->emit
-        . "(" . join(',', map {$_->emit} $self->arguments) . ")" . ";\n";
+        my @args;
+        my $code = '';
+        for ($self->arguments) {
+            my $id = AST::unique_id();
+            $code .= $_->m0ld($id);
+            push @args, $id;
+        }
+        my $invocant = AST::unique_id();
+        $code .= $self->capture->invocant->m0ld($invocant);
+        my $identifier = AST::unique_id();
+        $code .= $self->identifier->m0ld($identifier);
+        $code .= "my $ret = "
+          . $invocant
+          . "." . $identifier
+          . "(" . join(',', @args) . ")" . ";\n";
     } else {
         die 'unimplemented';
@@ -206 +210 @@
 }
 sub m0ld {
-    die "method m0ld is not supported on AST::Reg, m0ld doesn't support register aliasing\n"
+    my ($self,$ret) = @_;
+    "my $ret = ".$self->name."\n";
 }
 sub pretty {