Replace some Q:PIR with the various new ops.

Raku · Oct 25, 2012 · a01efec · a01efec
1 parent f80be32
commit a01efec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/src/HLL/Compiler.pm b/src/HLL/Compiler.pm
@@ -174,11 +174,7 @@ class HLL::Compiler {
     }
 
     method ctxsave() {
-        $*MAIN_CTX :=
-            Q:PIR {
-                $P0 = getinterp
-                %r = $P0['context';1]
-            };
+        $*MAIN_CTX := nqp::ctxcaller(nqp::ctx());
         $*CTXSAVE := 0;
     }
 

diff --git a/src/HLL/Grammar.pm b/src/HLL/Grammar.pm
@@ -323,10 +323,7 @@ of the match.
 
     method FAILGOAL($goal, $dba?) {
         unless $dba {
-            $dba := ~Q:PIR{
-                %r = getinterp
-                %r = %r['sub';1]
-            };
+            $dba := ~nqp::callercode();
         }
         self.panic("Unable to parse expression in $dba; couldn't find final $goal");
     }

diff --git a/src/ModuleLoader.pm b/src/ModuleLoader.pm
@@ -32,11 +32,7 @@ knowhow ModuleLoader {
     }
 
     method ctxsave() {
-        $*MAIN_CTX :=
-            Q:PIR {
-                $P0 = getinterp
-                %r = $P0['context';1]
-            };
+        $*MAIN_CTX := nqp::ctxcaller(nqp::ctx());
         $*CTXSAVE := 0;
     }
 

diff --git a/src/QRegex/Cursor.nqp b/src/QRegex/Cursor.nqp
@@ -82,10 +82,7 @@ role NQPCursorRole is export {
 
     method !cursor_start() {
         my $new := nqp::create(self);
-        my $sub := Q:PIR {
-            $P0 = getinterp
-            %r = $P0['sub';1]
-        };
+        my $sub := nqp::callercode();
         nqp::bindattr($new, $?CLASS, '$!orig', $!orig);
         nqp::bindattr($new, $?CLASS, '$!regexsub', nqp::ifnull(nqp::getcodeobj($sub), $sub));
         if nqp::defined($!restart) {
@@ -465,10 +462,7 @@ role NQPCursorRole is export {
 
     method FAILGOAL($goal, $dba?) {
         unless $dba {
-            $dba := ~Q:PIR{
-                %r = getinterp
-                %r = %r['sub';1]
-            };
+            $dba := ~nqp::callercode();
         }
         nqp::die("Unable to parse expression in $dba; couldn't find final $goal");
     }