Assorted unbusting.

Gets S05-grammar/protoregex.t passing in full, and probably others.
rakudo · Jun 22, 2013 · 7d6a3e8 · 7d6a3e8
1 parent 03e005c
commit 7d6a3e8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -1435,7 +1435,7 @@ class Perl6::World is HLL::World {
                     $/.CURSOR.panic($mkerr());
                 }
             }
-            return nqp::join(' ', @pieces);
+            return join(' ', @pieces);
         }
         else {
             $/.CURSOR.panic($mkerr());
@@ -1822,8 +1822,8 @@ class Perl6::World is HLL::World {
             unless $decl && $decl eq 'routine' {
                 @parts.shift() while self.is_pseudo_package(@parts[0]);
             }
-            nqp::join('::', @parts)
-                ~ ($with_adverbs ?? nqp::join('', @!colonpairs) !! '');
+            join('::', @parts)
+                ~ ($with_adverbs ?? join('', @!colonpairs) !! '');
         }
 
         # returns a QAST tree that represents the name
@@ -1846,7 +1846,7 @@ class Perl6::World is HLL::World {
                 }
             }
             else {
-                my $value := nqp::join('::', @!components);
+                my $value := join('::', @!components);
                 QAST::SVal.new(:$value);
             }
         }
@@ -2179,7 +2179,7 @@ class Perl6::World is HLL::World {
             }
             else {
                 nqp::die("Could not locate compile-time value for symbol " ~
-                    nqp::join('::', @name));
+                    join('::', @name));
             }
         }
 
@@ -2190,7 +2190,7 @@ class Perl6::World is HLL::World {
     method symbol_lookup(@name, $/, :$package_only = 0, :$lvalue = 0) {
         # Catch empty names and die helpfully.
         if +@name == 0 { $/.CURSOR.panic("Cannot compile empty name"); }
-        my $orig_name := nqp::join('::', @name);
+        my $orig_name := join('::', @name);
 
         # Handle fetching GLOBAL.
         if +@name == 1 && @name[0] eq 'GLOBAL' {
@@ -2492,7 +2492,7 @@ class Perl6::World is HLL::World {
             );
             return $ex.new(|%opts);
         } else {
-            my @err := ['Error while compiling, type ', nqp::join('::', $ex_type),  "\n"];
+            my @err := ['Error while compiling, type ', join('::', $ex_type),  "\n"];
             for %opts -> $key {
                 @err.push: '  ';
                 @err.push: $key;