Some pir:: => nqp:: in the MOP.

rakudo · Mar 16, 2013 · d98dd54 · d98dd54
1 parent e7f9bdd
commit d98dd54
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 64 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
diff --git a/src/Perl6/Metamodel/ClassHOW.pm b/src/Perl6/Metamodel/ClassHOW.pm
@@ -198,7 +198,7 @@ class Perl6::Metamodel::ClassHOW
 
     method concretization($obj, $ptype) {
         for @!concretizations {
-            if pir::perl6_decontainerize__PP($_[0]) =:= pir::perl6_decontainerize__PP($ptype) {
+            if nqp::decont($_[0]) =:= nqp::decont($ptype) {
                 return $_[1];
             }
         }

diff --git a/src/Perl6/Metamodel/ConcreteRoleHOW.pm b/src/Perl6/Metamodel/ConcreteRoleHOW.pm
@@ -105,12 +105,12 @@ class Perl6::Metamodel::ConcreteRoleHOW
     }
 
     method type_check($obj, $checkee) {
-        my $decont := pir::perl6_decontainerize__PP($checkee);
+        my $decont := nqp::decont($checkee);
         if $decont =:= $obj.WHAT {
             return 1;
         }
         for @!role_typecheck_list {
-            if pir::perl6_decontainerize__PP($_) =:= $decont {
+            if nqp::decont($_) =:= $decont {
                 return 1;
             }
         }

diff --git a/src/Perl6/Metamodel/CurriedRoleHOW.pm b/src/Perl6/Metamodel/CurriedRoleHOW.pm
@@ -103,15 +103,15 @@ class Perl6::Metamodel::CurriedRoleHOW
         # that we only want those that have the same parametric role
         # as us.
         my @cands;
-        my $crdc := pir::perl6_decontainerize__PP($!curried_role);
+        my $crdc := nqp::decont($!curried_role);
         if nqp::istype($checkee.HOW, self.WHAT) {
-            if pir::perl6_decontainerize__PP($checkee.HOW.curried_role($checkee)) =:= $crdc {
+            if nqp::decont($checkee.HOW.curried_role($checkee)) =:= $crdc {
                 @cands.push($checkee);
             }
         }
         for $checkee.HOW.role_typecheck_list($checkee) {
             if nqp::istype($_.HOW, self.WHAT) && !$_.HOW.archetypes.generic {
-                if pir::perl6_decontainerize__PP($_.HOW.curried_role($_)) =:= $crdc {
+                if nqp::decont($_.HOW.curried_role($_)) =:= $crdc {
                     @cands.push($_);
                 }
             }

diff --git a/src/Perl6/Metamodel/Dispatchers.pm b/src/Perl6/Metamodel/Dispatchers.pm
@@ -102,7 +102,7 @@ class Perl6::Metamodel::WrapDispatcher is Perl6::Metamodel::BaseDispatcher {
         my @cands := self.candidates;
         my $i := 0;
         while $i < +@cands {
-            if pir::perl6_decontainerize__PP(@cands[$i]) =:= pir::perl6_decontainerize__PP($wrapper) {
+            if nqp::decont(@cands[$i]) =:= nqp::decont($wrapper) {
                 nqp::splice(@cands, [], $i, 1);
                 return 1;
             }

diff --git a/src/Perl6/Metamodel/ParametricRoleGroupHOW.pm b/src/Perl6/Metamodel/ParametricRoleGroupHOW.pm
@@ -98,17 +98,17 @@ class Perl6::Metamodel::ParametricRoleGroupHOW
     }
 
     method type_check($obj, $checkee) {
-        my $decont := pir::perl6_decontainerize__PP($checkee);
+        my $decont := nqp::decont($checkee);
         if $decont =:= $obj.WHAT {
             return 1;
         }
         for self.prentending_to_be() {
-            if $decont =:= pir::perl6_decontainerize__PP($_) {
+            if $decont =:= nqp::decont($_) {
                 return 1;
             }
         }
         for @!role_typecheck_list {
-            if $decont =:= pir::perl6_decontainerize__PP($_) {
+            if $decont =:= nqp::decont($_) {
                 return 1;
             }
         }

diff --git a/src/Perl6/Metamodel/ParametricRoleHOW.pm b/src/Perl6/Metamodel/ParametricRoleHOW.pm
@@ -108,15 +108,15 @@ class Perl6::Metamodel::ParametricRoleHOW
     }
 
     method type_check($obj, $checkee) {
-        my $decont := pir::perl6_decontainerize__PP($checkee);
+        my $decont := nqp::decont($checkee);
         if $decont =:= $obj.WHAT {
             return 1;
         }
         if $!in_group && $decont =:= $!group {
             return 1;
         }
         for self.prentending_to_be() {
-            if $decont =:= pir::perl6_decontainerize__PP($_) {
+            if $decont =:= nqp::decont($_) {
                 return 1;
             }
         }