More pir:: => nqp::.

Raku · Feb 17, 2013 · 90f5160 · 90f5160
1 parent 26b0b8e
commit 90f5160
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/NQP/World.pm b/src/NQP/World.pm
@@ -125,7 +125,7 @@ class NQP::World is HLL::World {
                 self.add_fixup_task(:fixup_past($set_outer));
             }
 
-            return pir::getattribute__PPs($setting, 'lex_pad');
+            return nqp::ctxlexpad($setting, 'lex_pad');
         }
     }
 
@@ -154,7 +154,7 @@ class NQP::World is HLL::World {
                 ))));
         }
 
-        return pir::getattribute__PPs($module, 'lex_pad');
+        return nqp::ctxlexpad($module, 'lex_pad');
     }
 
     method import($stash) {
@@ -287,7 +287,7 @@ class NQP::World is HLL::World {
         else {
             # Create a fresh stub code, and set its name.
             $dummy := pir::nqp_fresh_stub__PP($stub_code);
-            pir::assign__vPS($dummy, $name);
+            nqp::setcodename($dummy, $name);
 
             # Tag it as a static code ref and add it to the root code refs set.
             pir::setprop__vPsP($dummy, 'STATIC_CODE_REF', $dummy);

diff --git a/src/QAST/Operations.nqp b/src/QAST/Operations.nqp
@@ -1070,21 +1070,21 @@ QAST::Operations.add_core_pirop_mapping('multicachefind', 'multi_cache_find', 'P
 
 # Constant mapping.
 my %const_map := nqp::hash(
-    'CCLASS_ANY',           pir::const::CCLASS_ANY,
-    'CCLASS_NUMERIC',       pir::const::CCLASS_NUMERIC,
-    'CCLASS_WHITESPACE',    pir::const::CCLASS_WHITESPACE,
-    'CCLASS_WORD',          pir::const::CCLASS_WORD,
-    'CCLASS_NEWLINE',       pir::const::CCLASS_NEWLINE,
-    'CCLASS_NEWLINE',       pir::const::CCLASS_NEWLINE,
-    'CCLASS_ALPHABETIC',    pir::const::CCLASS_ALPHABETIC,
-    'CCLASS_UPPERCASE',     pir::const::CCLASS_UPPERCASE,
-    'CCLASS_LOWERCASE',     pir::const::CCLASS_LOWERCASE,
-    'CCLASS_NUMERIC',       pir::const::CCLASS_NUMERIC,
-    'CCLASS_HEXADECIMAL',   pir::const::CCLASS_HEXADECIMAL,
-    'CCLASS_BLANK',         pir::const::CCLASS_BLANK,
-    'CCLASS_CONTROL',       pir::const::CCLASS_CONTROL,
-    'CCLASS_PUNCTUATION',   pir::const::CCLASS_PUNCTUATION,
-    'CCLASS_ALPHANUMERIC',  pir::const::CCLASS_ALPHANUMERIC
+    'CCLASS_ANY',           nqp::const::CCLASS_ANY,
+    'CCLASS_NUMERIC',       nqp::const::CCLASS_NUMERIC,
+    'CCLASS_WHITESPACE',    nqp::const::CCLASS_WHITESPACE,
+    'CCLASS_WORD',          nqp::const::CCLASS_WORD,
+    'CCLASS_NEWLINE',       nqp::const::CCLASS_NEWLINE,
+    'CCLASS_NEWLINE',       nqp::const::CCLASS_NEWLINE,
+    'CCLASS_ALPHABETIC',    nqp::const::CCLASS_ALPHABETIC,
+    'CCLASS_UPPERCASE',     nqp::const::CCLASS_UPPERCASE,
+    'CCLASS_LOWERCASE',     nqp::const::CCLASS_LOWERCASE,
+    'CCLASS_NUMERIC',       nqp::const::CCLASS_NUMERIC,
+    'CCLASS_HEXADECIMAL',   nqp::const::CCLASS_HEXADECIMAL,
+    'CCLASS_BLANK',         nqp::const::CCLASS_BLANK,
+    'CCLASS_CONTROL',       nqp::const::CCLASS_CONTROL,
+    'CCLASS_PUNCTUATION',   nqp::const::CCLASS_PUNCTUATION,
+    'CCLASS_ALPHANUMERIC',  nqp::const::CCLASS_ALPHANUMERIC
 );
 QAST::Operations.add_core_op('const', -> $qastcomp, $op {
     if nqp::existskey(%const_map, $op.name) {

diff --git a/src/QRegex/P5Regex/Grammar.nqp b/src/QRegex/P5Regex/Grammar.nqp
@@ -6,7 +6,7 @@ class QRegex::P5Regex::World is HLL::World {
     method create_code($past, $name) {
         # Create a fresh stub code, and set its name.
         my $dummy := pir::nqp_fresh_stub__PP(-> { nqp::die("Uncompiled code executed") });
-        pir::assign__vPS($dummy, $name);
+        nqp::setcodename($dummy, $name);
 
         # Tag it as a static code ref and add it to the root code refs set.
         pir::setprop__vPsP($dummy, 'STATIC_CODE_REF', $dummy);

diff --git a/src/QRegex/P6Regex/Grammar.nqp b/src/QRegex/P6Regex/Grammar.nqp
@@ -6,7 +6,7 @@ class QRegex::P6Regex::World is HLL::World {
     method create_code($past, $name) {
         # Create a fresh stub code, and set its name.
         my $dummy := pir::nqp_fresh_stub__PP(-> { nqp::die("Uncompiled code executed") });
-        pir::assign__vPS($dummy, $name);
+        nqp::setcodename($dummy, $name);
 
         # Tag it as a static code ref and add it to the root code refs set.
         pir::setprop__vPsP($dummy, 'STATIC_CODE_REF', $dummy);