Add CLONE-HASH-DECONTAINERIZED helper sub

rakudo · Jan 25, 2015 · e34a9c0 · e34a9c0
1 parent 225cf21
commit e34a9c0
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/core/control.pm b/src/core/control.pm
@@ -280,15 +280,9 @@ sub QX($cmd) {
     $result;
 #?endif
 #?if !parrot
-    my Mu $hash-with-containers := nqp::getattr(%*ENV, EnumMap, '$!storage');
-    my Mu $hash-without         := nqp::hash();
-    my Mu $enviter := nqp::iterator($hash-with-containers);
-    my $envelem;
-    while $enviter {
-        $envelem := nqp::shift($enviter);
-        nqp::bindkey($hash-without, nqp::iterkey_s($envelem), nqp::decont(nqp::iterval($envelem)))
-    }
-    my Mu $pio := nqp::openpipe(nqp::unbox_s($cmd), $*CWD.Str, $hash-without, '');
+    my Mu $pio := nqp::openpipe(
+      nqp::unbox_s($cmd), $*CWD.Str, CLONE-HASH-DECONTAINERIZED(%*ENV), ''
+    );
     fail "Unable to execute '$cmd'" unless $pio;
     my $result = nqp::p6box_s(nqp::readallfh($pio));
     nqp::closefh($pio);
@@ -308,4 +302,16 @@ sub NOT_ALL_DEFINED_TYPE(\values,\type) {
     False;
 }
 
+sub CLONE-HASH-DECONTAINERIZED(\hash) {
+    my Mu $hash-with-containers := nqp::getattr(hash,EnumMap,'$!storage');
+    my Mu $hash-without         := nqp::hash();
+    my Mu $enviter := nqp::iterator($hash-with-containers);
+    my $envelem;
+    while $enviter {
+        $envelem := nqp::shift($enviter);
+        nqp::bindkey($hash-without, nqp::iterkey_s($envelem), nqp::decont(nqp::iterval($envelem)))
+    }
+    $hash-without;
+}
+
 # vim: ft=perl6 expandtab sw=4