Liberalize "is it shaped" checking.

So the code works if the source isn't Array, but is shaped.
rakudo · Nov 20, 2015 · 5777a46 · 5777a46
1 parent 6d8ca4c
commit 5777a46
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/Array.pm b/src/core/Array.pm
@@ -230,16 +230,17 @@ my class Array { # declared in BOOTSTRAP
         proto method STORE(|) { * }
         multi method STORE(::?CLASS:D: Iterable:D \in) {
             allocate-shaped-storage(self, self.shape);
-            if nqp::istype(in, ShapedArray) {
-                if self.shape eqv in.shape {
+            my \in-shape = nqp::can(in, 'shape') ?? in.shape !! Nil;
+            if in-shape && !nqp::istype(in-shape.AT-POS(0), Whatever) {
+                if self.shape eqv in-shape {
                     # Can do a VM-supported memcpy-like thing in the future
                     for self.keys {
                         self.ASSIGN-POS(|$_, in.AT-POS(|$_))
                     }
                 }
                 else {
                     X::Assignment::ArrayShapeMismatch.new(
-                        source-shape => in.shape,
+                        source-shape => in-shape,
                         target-shape => self.shape
                     ).throw
                 }