Merge pull request #2980 from vrurg/EXPORT-bug

Decontainerize non-scalar symbols upon import
rakudo · Jun 13, 2019 · 6565810 · 6565810
2 parents 370c866 + 3af3bde
commit 6565810
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -1488,7 +1488,8 @@ class Perl6::World is HLL::World {
         my @clash;
         my @clash_onlystar;
         for sorted_keys(%stash) -> $key {
-            my $value := %stash{$key};
+            # Prevent exported scalars from deconting. All other symbols are to be unwrapped.
+            my $value := nqp::iseq_s(nqp::substr($key,0,1),'$') ?? %stash{$key} !! nqp::decont(%stash{$key});
             if $target.symbol($key) -> %sym {
                 # There's already a symbol. However, we may be able to merge
                 # if both are multis and have onlystar dispatchers.