Assorted pir:: => nqp::.

rakudo · Apr 9, 2013 · 00ca10a · 00ca10a
1 parent 83d0f6c
commit 00ca10a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
@@ -201,8 +201,8 @@ BEGIN {
             pir::perl6_booleanize__PI(1)
         }));
     Attribute.HOW.add_method(Attribute, 'set_build', static(sub ($self, $closure) {
-            pir::setattribute__0PPsP(nqp::decont($self),
-                Attribute, '$!build_closure', $closure);
+            nqp::bindattr(nqp::decont($self), Attribute, '$!build_closure', $closure);
+            $self
         }));
     Attribute.HOW.add_method(Attribute, 'build', static(sub ($self) {
             nqp::getattr(nqp::decont($self),
@@ -245,8 +245,8 @@ BEGIN {
                 my @avc_mro  := $avc_var.HOW.mro($avc_var);
                 my $i := 0;
                 $i := $i + 1 while @avc_mro[$i].HOW.is_mixin(@avc_mro[$i]);
-                nqp::bindattr($ins, Attribute, '$!auto_viv_container',
-                    pir::setattribute__0PPsP($avc_copy, @avc_mro[$i], '$!descriptor', $cd_ins));
+                nqp::bindattr($avc_copy, @avc_mro[$i], '$!descriptor', $cd_ins);
+                nqp::bindattr($ins, Attribute, '$!auto_viv_container', $avc_copy);
             }
             if $pkg.HOW.archetypes.generic {
                 nqp::bindattr($ins, Attribute, '$!package',

diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -283,9 +283,10 @@ my class Any {
         self;
     }
     multi method at_pos(Any:U \SELF: $pos) is rw {
-        pir::setattribute__0PPsP(my $v, Scalar, '$!whence',
+        nqp::bindattr(my $v, Scalar, '$!whence',
             -> { SELF.defined || &infix:<=>(SELF, Array.new);
                  SELF.bind_pos($pos, $v) });
+        $v
     }
 
     method all() { all(self.list) }
@@ -394,9 +395,10 @@ my class Any {
         fail "postcircumfix:<\{ \}> not defined for type {self.WHAT.perl}";
     }
     multi method at_key(Any:U \SELF: $key) is rw {
-        pir::setattribute__0PPsP(my $v, Scalar, '$!whence',
+        nqp::bindattr(my $v, Scalar, '$!whence',
             -> { SELF.defined || &infix:<=>(SELF, Hash.new);
                  SELF.bind_key($key, $v) });
+        $v
     }
 
     method reduce(&with) { self.list.reduce(&with) }

diff --git a/src/core/Routine.pm b/src/core/Routine.pm
@@ -36,8 +36,7 @@ my class Routine {
         }
         # Call this lexical sub to get rid of 'self' in the signature.
         sub checker(|) {
-            my Mu $cap := pir::find_lex__Ps('call_sig');
-            nqp::hllize($disp.find_best_dispatchee($cap, 1))
+            nqp::hllize($disp.find_best_dispatchee(nqp::usecapture(), 1))
         }
         checker(|$c);
     }

diff --git a/src/core/terms.pm b/src/core/terms.pm
@@ -86,7 +86,7 @@ sub term:<time>() { nqp::p6box_i(nqp::time_i()) }
 
     my $I := nqp::atkey(nqp::atkey(%*COMPILING, '%?OPTIONS'), 'I');
     if nqp::defined($I) {
-        if pir::does__IPs($I, 'array') {
+        if nqp::islist($I) {
             my Mu $iter := nqp::iterator($I);
             @INC.unshift: nqp::p6box_s(nqp::shift($iter)) while $iter;
         }