From 723f6a92c6af9a46dfbd066fb18e014868bd6487 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Tue, 30 Jun 2020 19:30:58 -0400
Subject: =?UTF-8?q?Tests=20for=20layer=204;=20fix=20=E2=9A=87=20with=20non?=
 =?UTF-8?q?-matching=20depths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spec/dzref         | 17 ++++++-----------
 spec/reference.bqn |  7 +++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'spec')

diff --git a/spec/dzref b/spec/dzref
index 997e5d58..00f6c85e 100755
--- a/spec/dzref
+++ b/spec/dzref
@@ -4,7 +4,6 @@ impl ← "◶ ← {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}
 √ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
 ∧ ←            ×
 ∨ ←            (+-×)
-> ←            (¬≤)
 | ← ×⟜×      ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}
 
 _eachm←{
@@ -90,16 +89,13 @@ DropV← {⊑⟜𝕩¨𝕨+↕𝕨-˜≠𝕩}
 Cell ← DropV⟜≢
 Pair ← {⟨𝕩⟩} ⊘ {⟨𝕨,𝕩⟩}
 
-Unbox←(0<≠∘⥊)◶⊢‿{
-  c←≢⊑𝕩
-  ! ∧´⥊(c≡≢)¨𝕩
-  𝕩⊑⟜ToArray˜⌜↕c
-}
-> ↩ Unbox          ⊘ >
 _ranks ← {⟨2⟩⊘⟨1,0⟩((⊣-1+|)˜⟜≠⊑¨<∘⊢)⥊∘𝔽}
 _depthOp_←{
   neg←0>n←𝕨𝔾_ranks𝕩 ⋄ F←𝔽
-  _d←{𝕨(∧´(neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶⟨(𝕗+neg)_d¨⋄F⟩𝕩}
+  _d←{
+    R←(𝕗+neg)_d
+    𝕨(2⥊(neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶(⟨R¨⋄R⟜𝕩¨∘⊣⟩≍⟨(𝕨R⊢)¨∘⊢⋄F⟩)𝕩
+  }
   𝕨 n _d 𝕩
 }
 ⚇ ← _depthOp_
@@ -125,7 +121,7 @@ _scan←{
 ` ← _scan
 _iterate_←{
   n←𝕨𝔾𝕩
-  F←𝕨(0⊘1)◶⟨𝔽,𝕨𝔽⊢⟩⊢
+  f←⊑𝕨⟨𝔽⟩⊘⟨𝕨𝔽⊢⟩𝕩
   l←u←0
   {!Int𝕩⋄l↩l⌊𝕩⋄u↩u⌈𝕩}⚇0 n
   a←𝕩⋄_p←{𝔽∘⊣`(1+𝕩)⥊<a}
@@ -133,7 +129,6 @@ _iterate_←{
   (|⊑<⟜0⊑pos‿neg˜)⚇0 n
 }
 
-≍ ← >∘Pair
 ⎉ ← _rankOp_
 ⍟ ← _iterate_
 ˘ ← ⎉¯1
@@ -319,7 +314,7 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
 
 {
   names ← ⥊"AB"∾⌜•a
-  f_chr ← "!√∧∨|>≡∾≍↑↓↕⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔"
+  f_chr ← "!√∧∨|≡∾↑↓↕⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔"
   m_chr ← "˘¨⌜´`"
   d_chr ← "⌾⎉⚇⍟◶"
   
diff --git a/spec/reference.bqn b/spec/reference.bqn
index 6ecf59d3..5a6ab5ab 100644
--- a/spec/reference.bqn
+++ b/spec/reference.bqn
@@ -196,7 +196,10 @@ Unbox←(0<≠∘⥊)◶⊢‿{
 _ranks ← {⟨2⟩⊘⟨1,0⟩((⊣-1+|)˜⟜≠⊑¨<∘⊢)⥊∘𝔽}
 _depthOp_←{
   neg←0>n←𝕨𝔾_ranks𝕩 ⋄ F←𝔽
-  _d←{𝕨(∧´(neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶⟨(𝕗+neg)_d¨⋄F⟩𝕩}
+  _d←{
+    R←(𝕗+neg)_d
+    𝕨(2⥊(neg∧𝕗≥0)∨(0⌈𝕗)≥Pair○≡)◶(⟨R¨⋄R⟜𝕩¨∘⊣⟩≍⟨(𝕨R⊢)¨∘⊢⋄F⟩)𝕩
+  }
   𝕨 n _d 𝕩
 }
 _rankOp_←{
@@ -220,7 +223,7 @@ _scan←{
 }
 _iterate_←{
   n←𝕨𝔾𝕩
-  F←𝕨(0⊘1)◶⟨𝔽,𝕨𝔽⊢⟩⊢
+  f←⊑𝕨⟨𝔽⟩⊘⟨𝕨𝔽⊢⟩𝕩
   l←u←0
   {!Int𝕩⋄l↩l⌊𝕩⋄u↩u⌈𝕩}⚇0 n
   a←𝕩⋄_p←{𝔽∘⊣`(1+𝕩)⥊<a}
-- 
cgit v1.2.3