.STORE should return self

Unfortunately, this doesn't fix the problem of .rotate/.reverse on 1dimmed shaped arrays
rakudo · Nov 15, 2016 · c5d33a2 · c5d33a2
1 parent cd765e6
commit c5d33a2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/core/Shaped1Array.pm b/src/core/Shaped1Array.pm
@@ -127,7 +127,8 @@
                       nqp::atpos($to,$i),
                       nqp::bindpos($to,$i,nqp::p6scalarfromdesc($desc))
                     ) = nqp::atpos($from,$i)
-                  )
+                  ),
+                  self
                 ),
                 X::Assignment::ArrayShapeMismatch.new(
                   source-shape => from.shape,
@@ -159,11 +160,15 @@
             )
         }
         multi method STORE(::?CLASS:D: Mu \item) {
-            nqp::ifnull(
-              nqp::atpos(nqp::getattr(self,List,'$!reified'),0),
-              nqp::bindpos(nqp::getattr(self,List,'$!reified'),0,
-                nqp::p6scalarfromdesc(nqp::getattr(self,Array,'$!descriptor')))
-            ) = item
+            nqp::stmts(
+              (nqp::ifnull(
+                nqp::atpos(nqp::getattr(self,List,'$!reified'),0),
+                nqp::bindpos(nqp::getattr(self,List,'$!reified'),0,
+                  nqp::p6scalarfromdesc(
+                    nqp::getattr(self,Array,'$!descriptor')))
+              ) = item),
+              self
+            )
         }
 
         multi method keys(::?CLASS:D:) {

diff --git a/src/core/ShapedArray.pm b/src/core/ShapedArray.pm
@@ -322,7 +322,10 @@
         multi method STORE(::?CLASS:D: ::?CLASS:D \in) {
             nqp::if(
               in.shape eqv self.shape && nqp::eqaddr(in.WHAT,self.WHAT),
-              MEMCPY(self,in),       # VM-supported memcpy-like thing?
+              nqp::stmts(
+                MEMCPY(self,in),     # VM-supported memcpy-like thing?
+                self
+              ),
               X::Assignment::ArrayShapeMismatch.new(
                 source-shape => in.shape,
                 target-shape => self.shape
@@ -332,10 +335,13 @@
         multi method STORE(::?CLASS:D: array:D \in) {
             nqp::if(
               in.shape eqv self.shape,
-              nqp::if(
-                nqp::istype(in.of,Int),
-                INTCPY(self,in),       # copy from native int
-                NUMCPY(self,in)        # copy from native num
+              nqp::stmts(
+                nqp::if(
+                  nqp::istype(in.of,Int),
+                  INTCPY(self,in),     # copy from native int
+                  NUMCPY(self,in)      # copy from native num
+                ),
+                self
               ),
               X::Assignment::ArrayShapeMismatch.new(
                 source-shape => in.shape,
@@ -409,7 +415,8 @@
                       )
                     )
                 }
-            }.new(self,in).sink-all
+            }.new(self,in).sink-all;
+            self
         }
         multi method STORE(::?CLASS:D: Mu \item) {
             X::Assignment::ToShaped.new(shape => self.shape).throw