Fix state, START.

rakudo · Jul 14, 2012 · e08c1dd · e08c1dd
1 parent 39bd6cf
commit e08c1dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/QPerl6/Actions.pm b/src/QPerl6/Actions.pm
@@ -1417,7 +1417,7 @@ class QPerl6::Actions is HLL::Actions {
                 }
                 if $*SCOPE eq 'state' {
                     $past := QAST::Op.new( :op('if'),
-                        PAST::Op.new( :pirop('perl6_state_needs_init I') ),
+                        QAST::Op.new( :op('p6stateinit') ),
                         $past,
                         $orig_past);
                 }
@@ -1461,7 +1461,7 @@ class QPerl6::Actions is HLL::Actions {
                 }
                 if $*SCOPE eq 'state' {
                     $list := QAST::Op.new( :op('if'),
-                        PAST::Op.new( :pirop('perl6_state_needs_init I') ),
+                        QAST::Op.new( :op('p6stateinit') ),
                         $list, $orig_list);
                 }
             }

diff --git a/src/QPerl6/Ops.pm b/src/QPerl6/Ops.pm
@@ -33,6 +33,7 @@ $ops.add_hll_pirop_mapping('perl6', 'p6capturelex', 'perl6_capture_lex', '0P');
 $ops.add_hll_pirop_mapping('perl6', 'p6vmcodetoobj', 'perl6_code_object_from_parrot_sub', 'PP');
 $ops.add_hll_pirop_mapping('perl6', 'p6bindassert', 'perl6_assert_bind_ok', '0PP');
 $ops.add_hll_pirop_mapping('perl6', 'p6getpackage', 'perl6_get_package_through_who', 'PPs');
+$ops.add_hll_pirop_mapping('perl6', 'p6stateinit', 'perl6_state_needs_init', 'I');
 
 # Boxing and unboxing configuration.
 QAST::Operations.add_hll_box('perl6', 'i', -> $qastcomp, $post {

diff --git a/src/QPerl6/World.pm b/src/QPerl6/World.pm
@@ -1356,7 +1356,7 @@ class QPerl6::World is HLL::World {
             # in other cases.
             make QAST::Op.new(
                 :op('if'),
-                PAST::Op.new( :pirop('perl6_state_needs_init I') ),
+                QAST::Op.new( :op('p6stateinit') ),
                 QAST::Op.new(
                     :op('p6store'),
                     QAST::Var.new( :name($sym), :scope('lexical') ),