Make .WHAT return something more sensible for arrays/hashes

rakudo · Aug 19, 2013 · e6419ae · e6419ae
1 parent 8f64f1e
commit e6419ae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/core/Array.pm b/src/core/Array.pm
@@ -185,7 +185,8 @@ class Array { # declared in BOOTSTRAP
     method PARAMETERIZE_TYPE(Mu $t, |c) {
         if c.elems == 0 {
             my $what := self but TypedArray[$t.WHAT];
-            $what.HOW.set_name(self, "Array[{$t.HOW.name(self)}]");
+            # needs to be done in COMPOSE phaser when that works
+            $what.HOW.set_name(self,"{self.HOW.name(self)}[{$t.HOW.name($t)}]");
             $what;
         }
         else {

diff --git a/src/core/Hash.pm b/src/core/Hash.pm
@@ -347,12 +347,14 @@ my class Hash { # declared in BOOTSTRAP
     method PARAMETERIZE_TYPE(Mu $t, |c) {
         if c.elems == 0 {
             my $what := self but TypedHash[$t.WHAT];
-            $what.HOW.set_name(self, "Hash[{$t.HOW.name(self)}]");
+            # needs to be done in COMPOSE phaser when that works
+            $what.HOW.set_name(self,"{self.HOW.name(self)}[{$t.HOW.name($t)}]");
             $what;
         }
         elsif c.elems == 1 {
             my $what := self but TypedHash[$t.WHAT, c[0]];
-            $what.HOW.set_name(self, "Hash[{$t.HOW.name(self)},{c[0].HOW.name(self)}]");
+            # needs to be done in COMPOSE phaser when that works
+            $what.HOW.set_name(self,"{self.HOW.name(self)}[{$t.HOW.name($t)},{c[0].HOW.name(c[0])}]");
             $what;
         }
         else {

diff --git a/src/core/Variable.pm b/src/core/Variable.pm
@@ -65,11 +65,14 @@ multi trait_mod:<of>(Variable:D $v, |c ) {
 multi trait_mod:<of>(Variable:D $v, Mu:U $of ) {
     my $var  := $v.var;
     my $what := $var.VAR.WHAT;
+    my $how  := $what.HOW;
     nqp::getattr(
         $var,
-        $what.HOW.mixin_base($what),
+        $how.mixin_base($what),
         '$!descriptor'
     ).set_of(nqp::decont($of));
+    # probably can go if we have a COMPOSE phaser for PARAMETERIZE
+    $how.set_name($what,"{$how.name($what)}[{$of.HOW.name($of)}]");
 }
 
 # phaser traits