Fix .perl on uncontained typed hashes

rakudo · May 28, 2015 · 478994f · 478994f
1 parent 802983e
commit 478994f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -385,17 +385,15 @@ my class Hash { # declared in BOOTSTRAP
             HashIter.invert(self,$!keys).list
         }
         multi method perl(::?CLASS:D \SELF:) {
-            if nqp::iscont(SELF) and TKey === Any and TValue === Mu {
+            my $TKey-perl   := TKey.perl;
+            my $TValue-perl := TValue.perl;
+            if nqp::iscont(SELF) && $TKey-perl eq 'Any' && $TValue-perl eq 'Mu' {
                 ':{' ~ SELF.pairs.sort.map({.perl}).join(', ') ~ '}'
             }
             else {
-                'Hash['
-                  ~ TValue.perl
-                  ~ ','
-                  ~ TKey.perl
-                  ~ '].new('
-                  ~ self.pairs.sort.map({.perl(:arglist)}).join(', ')
-                  ~ ')';
+                "Hash[$TValue-perl,$TKey-perl].new({
+                  self.pairs.sort.map({.perl(:arglist)}).join(', ')
+                })";
             }
         }
         multi method DELETE-KEY($key) {