Merge pull request #80 from kboga/pir-to-nqp-in-tests

pir -> nqp for tests

Author: jnthn

t/p5regex/01-p5regex.t

@@ -34,7 +34,7 @@ sub test_line($line) {
     $target := unescape($target);
 
     my $expect_substr := nqp::substr($expect, 0, 1) eq '<'
-                           ?? pir::chopn__Ssi(nqp::substr($expect, 1), 1)
+                           ?? nqp::substr($expect, 1, nqp::chars($expect) - 2)
                            !! '';
 
     my $rxcomp := nqp::getcomp('QRegex::P5Regex');

t/qregex/01-qregex.t

@@ -40,7 +40,7 @@ sub test_line($line) {
     $target := unescape($target);
 
     my $expect_substr := nqp::substr($expect, 0, 1) eq '<'
-                           ?? pir::chopn__Ssi(nqp::substr($expect, 1), 1)
+                           ?? nqp::substr($expect, 1, nqp::chars($expect) - 2)
                            !! '';
 
     my $rxcomp := nqp::getcomp('QRegex::P6Regex');

t/serialization/02-types.t

@@ -121,8 +121,8 @@ sub add_to_sc($sc, $idx, $obj) {
     my $m2 := method () { "Hi, I'm " ~ nqp::getattr(self, self.WHAT, '$!name') };
     nqp::scsetcode($sc, 0, $m1);
     nqp::scsetcode($sc, 1, $m2);
-    pir::setprop__vPsP($m1, 'STATIC_CODE_REF', $m1);
-    pir::setprop__vPsP($m2, 'STATIC_CODE_REF', $m2);
+    nqp::markcodestatic($m1);
+    nqp::markcodestatic($m2);
 
     my $type := NQPClassHOW.new_type(:name('Llama'), :repr('P6opaque'));
     $type.HOW.add_attribute($type, NQPAttribute.new(name => '$!name'));

t/serialization/03-closures.t

@@ -17,7 +17,7 @@ sub add_to_sc($sc, $idx, $obj) {
 
     my $m1 := (method () { "success!" }).get_lexinfo().get_static_code();
     nqp::scsetcode($sc, 0, $m1);
-    pir::setprop__vPsP($m1, 'STATIC_CODE_REF', $m1);
+    nqp::markcodestatic($m1);
 
     # Here we make a clone of it, which is what we're testing.
     my $m2 := nqp::clone($m1);
@@ -58,11 +58,11 @@ sub add_to_sc($sc, $idx, $obj) {
     $raw_sub('XXX');
 
     nqp::scsetcode($sc, 0, $raw_sub);
-    pir::setprop__vPsP($raw_sub, 'STATIC_CODE_REF', $raw_sub);
+    nqp::markcodestatic($raw_sub);
 
     my $raw_meth := $m1.get_lexinfo().get_static_code();
     nqp::scsetcode($sc, 1, $raw_meth);
-    pir::setprop__vPsP($raw_meth, 'STATIC_CODE_REF', $raw_meth);
+    nqp::markcodestatic($raw_meth);
 
     my $type1 := nqp::knowhow().new_type(:name('RoleLikeTest1'), :repr('P6opaque'));
     $type1.HOW.add_method($type1, 'm', $m1);