Avoid using Reshape extension most of the time

1 files changed, 11 insertions, 12 deletions

diff --git a/src/r.bqn b/src/r.bqn
index 264245a1..71b09e5b 100644
--- a/src/r.bqn
+++ b/src/r.bqn
@@ -111,8 +111,6 @@ _under_←{
   s⥊{e=𝕩}◶⟨⊑⟜(⥊𝕩),{𝕩⋄r←(j⊑g)⊑v⋄e↩P j↩1+j⋄r}⟩⌜i
 }
 
-Deshape←IsArray◶{⟨𝕩⟩}‿⥊
-
 ¨ ↩ {(𝔽⌜)⊘(𝔽_eachd)○ToArray}
 
 match←{(0⊑𝕨)◶(1⊑𝕨)‿𝕩}´⟨
@@ -165,6 +163,7 @@ SelSub←{
   }𝕩
 }
 
+Deshape←IsArray◶{⟨𝕩⟩}‿⥊
 Reshape←{
   ! 1≥=𝕨
   𝕨↩Deshape 𝕨
@@ -175,7 +174,7 @@ Reshape←{
     𝕩(0<n)◶⟨Type⊸(⊣⌜)⋄⥊⊸{⊑⟜𝕨⌜n|𝕩}⟩↕l
   }⍟(l≠n)𝕩
 }⟜ToArray
-⥊ ↩ Deshape        ⊘ Reshape
+⥊ ↩ Deshape        ⊘ ⥊
 
 Range←{
   I←{!Nat𝕩⋄↕𝕩}
@@ -194,7 +193,7 @@ _depthOp_←{
   neg←0>n←𝕨𝔾_ranks𝕩 ⋄ F←𝔽
   _d←{
     R←(𝕗+neg)_d
-    𝕨(×⟜2⊸+´2⥊(neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶(⟨R¨⋄R⟜𝕩⌜∘⊣⋄(𝕨R⊢)⌜∘⊢⋄F⟩)𝕩
+    𝕨(×⟜2⊸+´2 Reshape (neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶(⟨R¨⋄R⟜𝕩⌜∘⊣⋄(𝕨R⊢)⌜∘⊢⋄F⟩)𝕩
   }
   𝕨 n _d 𝕩
 }
@@ -247,16 +246,16 @@ JoinTo←∨○(1≠=)◶∾‿{
 Take←{
   T←{
     ! Int 𝕨
-    l←≠𝕩 ⋄ n←𝕨<0 ⋄ e←l⌊r←|𝕨 ⋄ s←⟨r⟩
-    i ← 𝕩{s∾↩c←1 Cell 𝕨⋄𝕩(×+⌜↕∘⊢)×´c}⍟(1≠=𝕩) (l-e)+⍟n ↕e
-    s ⥊ 𝕩{(⥊𝕩)n◶⟨∾,∾˜⟩(r-e)⥊Type𝕗}⍟(l<r) ⊑⟜(⥊𝕩)⌜i
+    l←≠𝕩 ⋄ n←𝕨<0 ⋄ e←l⌊r←|𝕨 ⋄ s←⟨r⟩ ⋄ m←1
+    i ← 𝕩{s∾↩c←1 Cell 𝕨⋄𝕩(×+⌜↕∘⊢)m↩×´c}⍟(1≠=𝕩) (l-e)+⍟n ↕e
+    s⥊𝕩{(⥊𝕩)n◶⟨∾,∾˜⟩(0⊑⥊Type𝕗)⌜↕m×r-e}⍟(l<r) ⊑⟜(⥊𝕩)⌜i
   }
-  𝕨 T _onAxes_ 0 (⟨1⟩⥊˜0⌈𝕨-○≠⊢)⊸∾∘≢⊸⥊𝕩
+  𝕨 T _onAxes_ 0 ((1⌜∘↕0⌈𝕨-○≠⊢)⊸∾∘≢⥊⥊) 𝕩
 }
 Prefixes ← {!1≤=𝕩 ⋄ Take⟜𝕩⌜↕1+≠𝕩}
 ↑ ← Prefixes       ⊘ Take
 Drop←{
-  s←(≠𝕨)(⊣↑⊢∾˜1⥊˜0⌈-⟜≠)≢𝕩
+  s←(≠𝕨)(⊣↑⊢∾˜·1⌜∘↕0⌈-⟜≠)≢𝕩
   ((sׯ1⋆𝕨>0)+(-s)⌈s⌊𝕨)↑𝕩
 }
 Suffixes ← {!1≤=𝕩 ⋄ Drop⟜𝕩⌜↕1+≠𝕩}
@@ -276,13 +275,12 @@ Reverse ← {!1≤=𝕩 ⋄ (-↕⊸¬≠𝕩)⊏𝕩}
 Rotate ← {!Int𝕨 ⋄ l←≠𝕩⋄(l|𝕨+↕l)⊏𝕩} _onAxes_ 0
 
 Rep ← Indices⊸⊏
-Replicate ← {0<=𝕨}◶(⥊˜⟜≠Rep⊢)‿{!𝕨=○≠𝕩⋄𝕨Rep𝕩} _onAxes_ (1-0=≠)
+Replicate ← {0<=𝕨}◶{𝕨⌜⊸Rep𝕩}‿{!𝕨=○≠𝕩⋄𝕨Rep𝕩} _onAxes_ (1-0=≠)
 
 ↕ ↩ Range          ⊘ Windows
 ⌽ ← Reverse        ⊘ Rotate
 / ← Indices        ⊘ Replicate
 
-
 Join←(1≠=)◶⟨∨´1≠=⌜,1⟩◶{
   # List of lists
   i←j←¯1⋄e←⟨⟩⋄a←𝕩
@@ -434,12 +432,13 @@ _repeat_←{
   n←𝕨𝔾𝕩
   l←u←0
   {!Int𝕩⋄l↩l⌊𝕩⋄u↩u⌈𝕩}⚇0 n
-  a←𝕩⋄_p←{𝔽∘⊣`(1+𝕩)⥊<a}
+  a←𝕩⋄_p←{𝔽∘⊣`⟨a⟩∾↕0+𝕩}
   pos←(𝕨𝔽 ⊢)_p u
   neg←(𝕨𝔽⁼⊢)_p-l
   (|⊑<⟜0⊑pos‿neg˜)⚇0 n
 }
 ⍟ ↩ _repeat_
 
+⥊ ↩ Deshape        ⊘ Reshape
 ⌜ ↩ {𝔽⌜○ToArray}
 ⌾ ← _under_