A bunch more PAST::Var => QAST::Var, fixing simple sub declarations along the way.

Author: jnthn

src/NQPQ/Actions.pm

@@ -165,7 +165,7 @@ class NQP::Actions is HLL::Actions {
             if $ml {
                 if ~$ml<sym> eq 'for' {
                     $past := QAST::Block.new( :blocktype('immediate'),
-                        PAST::Var.new( :name('$_'), :scope('parameter'), :isdecl(1) ),
+                        QAST::Var.new( :name('$_'), :scope('lexical'), :decl('param') ),
                         $past);
                     $past.symbol('$_', :scope('lexical') );
                     $past.arity(1);
@@ -349,7 +349,7 @@ class NQP::Actions is HLL::Actions {
         $past.op('for');
         my $block := $past[1];
         unless $block.arity {
-            $block[0].push( PAST::Var.new( :name('$_'), :scope('parameter') ) );
+            $block[0].push( QAST::Var.new( :name('$_'), :scope('lexical'), :decl('param') ) );
             $block.symbol('$_', :scope('lexical') );
             $block.arity(1);
         }
@@ -866,9 +866,12 @@ class NQP::Actions is HLL::Actions {
                 }
                 else {
                     my $BLOCK := $*W.cur_lexpad();
-					$BLOCK[0].push(PAST::Var.new( :name($name), :isdecl(1), :directaccess(1),
-                                          :viviself($past), :scope('lexical') ) );
-                    $BLOCK.symbol($name, :scope('lexical') );
+					$BLOCK[0].push(QAST::Op.new(
+                        :op('bind'),
+                        QAST::Var.new( :name($name), :scope('lexical'), :decl('var') ),
+                        $past
+                    ));
+                    $BLOCK.symbol($name, :scope('lexical'));
                     if $*SCOPE eq 'our' {
                         # Need to install it at loadinit time but also re-bind
                         # it per invocation.
@@ -880,7 +883,7 @@ class NQP::Actions is HLL::Actions {
                         ));
                     }
                 }
-                $past := QAST::Var.new( :name($name) );
+                $past := QAST::Var.new( :name($name), :scope('lexical') );
             }
             else {
                 $/.CURSOR.panic("$*SCOPE scoped routines are not supported yet");
@@ -1418,13 +1421,13 @@ class NQP::Actions is HLL::Actions {
 
     method quote:sym</ />($/) {
         my $block := $*W.pop_lexpad();
-        $block[0].push(PAST::Var.new(:name<self>, :scope<parameter>));
+        $block[0].push(QAST::Var.new(:name<self>, :scope<lexical>, :decl<param>));
         $block[0].push(QAST::Op.new(
             :op('bind'),
             QAST::Var.new(:name<self>, :scope<register>, :isdecl(1) ),
             QAST::Var.new( :name<self>, :scope('lexical') )));
-        $block[0].push(PAST::Var.new(:name<$¢>, :scope<lexical>, :isdecl(1)));
-        $block[0].push(PAST::Var.new(:name<$/>, :scope<lexical>, :isdecl(1)));
+        $block[0].push(QAST::Var.new(:name<$¢>, :scope<lexical>, :isdecl(1)));
+        $block[0].push(QAST::Var.new(:name<$/>, :scope<lexical>, :isdecl(1)));
         $block.symbol('$¢', :scope<lexical>);
         $block.symbol('$/', :scope<lexical>);
 

src/NQPQ/World.pm

@@ -179,14 +179,11 @@ class NQP::World is HLL::World {
     # Adds a fixup to install a specified QAST::Block in a package under the
     # specified name.
     method install_package_routine($package, $name, $past_block) {
-        my $fixup := PAST::Op.new(
-            :pasttype('bind_6model'),
-            PAST::Var.new(
-                :scope('keyed'),
-                PAST::Op.new( :pirop('get_who PP'), self.get_slot_past_for_object($package) ),
-                ~$name
-            ),
-            PAST::Val.new( :value($past_block) )
+        my $fixup := QAST::Op.new(
+            :op('bindkey'),
+            QAST::Op.new( :op('getwho'), QAST::WVal.new( :value($package) ) ),
+            QAST::SVal.new( :value(~$name) ),
+            QAST::BVal.new( :value($past_block) )
         );
         self.add_fixup_task(:deserialize_past($fixup), :fixup_past($fixup));
     }
@@ -454,9 +451,10 @@ class NQP::World is HLL::World {
             for %symbols {
                 if !%seen{$_.key} && nqp::existskey($_.value, 'value') {
                     try {
-                        $wrapper[0].push(PAST::Var.new(
-                            :name($_.key), :scope('lexical_6model'), :isdecl(1),
-                            :viviself(self.get_ref(($_.value)<value>))
+                        $wrapper[0].push(QAST::Op.new(
+                            :op('bind'),
+                            QAST::Var.new( :name($_.key), :scope('lexical'), :isdecl('var') ),
+                            QAST::WVal.new( :value(($_.value)<value>) )
                         ));
                     };
                     %seen{$_.key} := 1;