Updates to run on latest NQP.

rakudo · Apr 14, 2013 · 452a072 · 452a072
1 parent b5bdbe4
commit 452a072
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -1230,7 +1230,8 @@ class Perl6::World is HLL::World {
             :compilation_mode(0),
             $wrapper
         );
-        my $precomp := nqp::getcomp('perl6').compile($compunit, :from<optimize>);
+        my $precomp := nqp::getcomp('perl6').compile($compunit,
+            :from<optimize>, :compunit_ok(1));
         $precomp[0].get_lexinfo.set_static_lexpad($slp);
         $precomp();
 

diff --git a/src/core/control.pm b/src/core/control.pm
@@ -151,9 +151,9 @@ multi sub eval(Str $code, :$lang = 'perl6', PseudoStash :$context) {
     my $compiler := nqp::getcomp($lang);
     X::Eval::NoSuchLang.new(:$lang).throw
         if nqp::isnull($compiler);
-    my $pbc      := $compiler.compile($code, :outer_ctx($eval_ctx), :global(GLOBAL));
-    nqp::atpos($pbc, 0).set_outer_ctx($eval_ctx);
-    $pbc();
+    my $compiled := $compiler.compile($code, :outer_ctx($eval_ctx), :global(GLOBAL));
+    nqp::forceouterctx(nqp::getattr($compiled, ForeignCode, '$!do'), $eval_ctx);
+    $compiled();
 }
 
 

diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2013.03-15-g5104c2e
+2013.03-27-gd46b465