Restore @A[Enum] behaviour

Apparently this got broken a while ago, and not noticed in tests.
rakudo · Nov 12, 2016 · 7d711ee · 7d711ee
1 parent fc6d4f3
commit 7d711ee
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/src/core/Array.pm b/src/core/Array.pm
@@ -201,23 +201,41 @@ my class Array { # declared in BOOTSTRAP
     proto method new(|) { * }
     multi method new(:$shape!) {
         nqp::if(
-          nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+          nqp::defined($shape),
+          set-shape(self,$shape),
+          nqp::if(
+            Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+            set-shape(self,$shape.^elems),
+            nqp::create(self)
+          )
         )
     }
     multi method new() {
         nqp::create(self)
     }
     multi method new(\values, :$shape!) {
         nqp::if(
-          nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+          nqp::defined($shape),
+          set-shape(self,$shape),
+          nqp::if(
+            Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+            set-shape(self,$shape.^elems),
+            nqp::create(self)
+          )
         ).STORE(values)
     }
     multi method new(\values) {
         nqp::create(self).STORE(values)
     }
     multi method new(**@values is raw, :$shape!) {
         nqp::if(
-          nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+          nqp::defined($shape),
+          set-shape(self,$shape),
+          nqp::if(
+            Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+            set-shape(self,$shape.^elems),
+            nqp::create(self)
+          )
         ).STORE(@values)
     }
     multi method new(**@values is raw) {

diff --git a/src/core/ShapedNArray.pm b/src/core/ShapedNArray.pm
@@ -6,13 +6,9 @@
     sub set-shape(\base, \shape) is raw {
         nqp::stmts(
           (my $shape := nqp::decont(nqp::if(
-            Metamodel::EnumHOW.ACCEPTS(shape.HOW),
-            shape.^elems,
-            nqp::if(
-              nqp::istype(shape,List),
-              shape,
-              shape.list
-            )
+            nqp::istype(shape,List),
+            shape,
+            shape.list
           ))),
           nqp::if(
             (my int $dimensions = $shape.elems),  # reifies

diff --git a/src/core/TypedArray.pm b/src/core/TypedArray.pm
@@ -5,23 +5,41 @@
         proto method new(|) { * }
         multi method new(:$shape!) {
             set-descriptor(nqp::if(
-              nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+              nqp::defined($shape),
+              set-shape(self,$shape),
+              nqp::if(
+                Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+                set-shape(self,$shape.^elems),
+                nqp::create(self)
+              )
             ))
         }
         multi method new() {
             set-descriptor(nqp::create(self))
         }
         multi method new(\values, :$shape!) {
             set-descriptor(nqp::if(
-              nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+              nqp::defined($shape),
+              set-shape(self,$shape),
+              nqp::if(
+                Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+                set-shape(self,$shape.^elems),
+                nqp::create(self)
+              )
             )).STORE(values)
         }
         multi method new(\values) {
             set-descriptor(nqp::create(self)).STORE(values)
         }
         multi method new(**@values is raw, :$shape!) {
             set-descriptor(nqp::if(
-              nqp::defined($shape),set-shape(self,$shape),nqp::create(self)
+              nqp::defined($shape),
+              set-shape(self,$shape),
+              nqp::if(
+                Metamodel::EnumHOW.ACCEPTS($shape.HOW),
+                set-shape(self,$shape.^elems),
+                nqp::create(self)
+              )
             )).STORE(@values)
         }
         multi method new(**@values is raw) {