Generalize scopedlex to also handle puts

sorear · Jul 16, 2010 · 0d2e83d · 0d2e83d
1 parent d45d477
commit 0d2e83d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CgOp.pm b/CgOp.pm
@@ -203,7 +203,8 @@ use warnings;
     }
 
     sub scopedlex {
-        CgOp::NIL->new(ops => [[ scopelexget => $_[0] ]]);
+        my $n = shift;
+        CgOp::NIL->new(ops => [ @_, [ scopelex => $n, scalar @_ ]]);
     }
 
     sub lexput {

diff --git a/CodeGen.pm b/CodeGen.pm
@@ -572,8 +572,8 @@ use 5.010;
 
     # These are completely derived.
 
-    sub scopelexget {
-        my ($self, $name) = @_;
+    sub scopelex {
+        my ($self, $name, $set) = @_;
         my $body = $self->body // $self->bodies->[-1];
         my ($order, $scope) = (0, $body);
         while ($scope && !$scope->lexical->{$name}) {
@@ -583,7 +583,11 @@ use 5.010;
         if (!$scope) {
             die "Failed to resolve lexical $name in " . $body->name;
         }
-        $self->lexget($order, $name);
+        if ($set) {
+            $self->lexput($order, $name);
+        } else {
+            $self->lexget($order, $name);
+        }
     }
 
     sub string_var {
@@ -611,7 +615,7 @@ use 5.010;
 
     sub box {
         my ($self, $ty) = @_;
-        $self->scopelexget($ty);
+        $self->scopelex($ty);
         $self->fetch;
         $self->clr_call_direct('Kernel.BoxAny', 2);
     }

diff --git a/Decl.pm b/Decl.pm
@@ -248,7 +248,7 @@ use CgOp;
 
         CgOp::sink(
             CgOp::methodcall(CgOp::aux('how'), "add-super",
-                CgOp::scopedlex($self->name . "!HOW", $body)));
+                CgOp::scopedlex($self->name . "!HOW")));
     }
 
     __PACKAGE__->meta->make_immutable;