From 92fad6dd8d642dc131106db707080a5cd764e2f7 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Mon, 25 Jan 2021 21:43:32 -0500
Subject: Use fill element to Join empty array (multiplying inner and outer
 shape)

---
 src/r.bqn | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/r.bqn b/src/r.bqn
index 641d5084..1b76cc58 100644
--- a/src/r.bqn
+++ b/src/r.bqn
@@ -275,13 +275,12 @@ Depth←IsArray◶0‿{1+0(⊣-≤×-)´Depth⌜⥊𝕩}
 
 IF ← ⊢⊣!∘≡  # Intersect fill
 IEF← (0<≠)◶⟨⊢_fillBy_ Fill, ⊢_fillBy_ IF´⟩∘⥊
-_fillMerge ← {𝔽 ⊣_fillBy_⊢ IEF}
-MergeA←{
+_fillMerge_ ← {(0<≠∘⥊)◶⟨(𝔾○≢⥊⟨⟩˙)_fillBy_⊢⟜Fill, 𝔽 ⊣_fillBy_⊢ IEF⟩}
+Merge←{
   c←≢0⊑⥊𝕩
   ">𝕩: Elements of 𝕩 must have matching shapes" ! 1×´(c≡≢)⌜⥊𝕩
   𝕩⊑⟜Deshape˜⌜c⥊↕1×´c
-}_fillMerge
-Merge ← (0<≠∘⥊)◶⟨(∾○≢⥊⟨⟩˙)_fillBy_⊢⟜Fill, MergeA⟩⍟IsArray
+}_fillMerge_∾⍟IsArray
 
 Join1←{
   # List of lists
@@ -317,7 +316,11 @@ JoinM←{
 }
 Join←(2⌊=)◶⟨
   Merge, (1×´(1==)⌜)◶JoinM‿Join1, JoinM
-⟩_fillMerge⍟{"∾𝕩: 𝕩 must be an array" ! IsArray 𝕩 ⋄ 0<≠⥊𝕩}
+⟩_fillMerge_{
+  r←≠𝕨 ⋄ d←≠𝕩
+  "∾𝕩: empty 𝕩 fill rank must be at least argument rank" ! d≥r
+  (r≤⊣)◶⟨⊑⟜𝕨⊸×,⊢⟩⟜(⊑⟜𝕩)⌜↕d
+} ⊣ "∾𝕩: 𝕩 must be an array"!IsArray
 
 _takeDrop←{
   ⟨gl,Noop,_inds⟩←𝕗
-- 
cgit v1.2.3