Tests for layer 4; fix ⚇ with non-matching depths

3 files changed, 46 insertions, 24 deletions

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}
diff --git a/test/testref.bqn b/test/testref.bqn
index 066ca277..bedfbfe0 100644
--- a/test/testref.bqn
+++ b/test/testref.bqn
@@ -1,8 +1,7 @@
 ⍝ Tests of primitive functionality
 ⍝ Ordering matches the reference implementations
 
-•←/¬∾´⟨
-{⟨
+•←/¬⟨
   ⍝ LAYER 0
   ⍝ [0,34)
   0≡¯2+2
@@ -39,9 +38,7 @@
   ⟨⟩≡↕0
   ⟨0⟩≡↕1
   ⟨0,1,2,3,4,5,6⟩≡↕7
-⟩⊣𝕩}⍟1 34⥊1
 
-{⟨
   ⍝ LAYER 1
   ⍝ [34,56)
   3≡4>◶+‿-1
@@ -77,8 +74,6 @@
   1≡¬0
   2≡¬¯1
   0≡3¬4
-⟩⊣𝕩}⍟1 32⥊1
-{⟨
   2≡4¬3
   4≡5¬2
   0≡|0
@@ -118,9 +113,7 @@
   (2⊸⊑≡⊢´)"a"‿2‿(3‿"d")
   2(⊣≡⊢´)"a"‿2‿(3‿"d")
   7‿10≡+¨´⟨⟨2,3⟩,⟨5,7⟩⟩
-⟩⊣𝕩}⍟1 38⥊1
 
-{⟨
   ⍝ LAYER 2
   ⍝ [104,117)
   ⟨⟩≡⟨⟩∾""
@@ -136,9 +129,7 @@
   3(+¨≡+⌜)↕6
   3‿4‿5‿6‿6≡{F:F⍟(×≡)⊸∾⟜⥊´𝕩}⟨2,1⟩+⟨⟨⟨⟨1,2⟩,3⟩,4⟩,5⟩
   (=¨⟜(⥊⟜(↕×´)3‿4)≡(↕4)=⌜˜4|⊢)1‿6‿8
-⟩⊣𝕩}⍟1 13⥊1
 
-{⟨
   ⍝ LAYER 3
   ⍝ [117,152)
   2≡⊑⟨2⟩
@@ -176,5 +167,38 @@
   (1¨≡-○≡˜⟜↕¨)⟨0,⟨⟩,⟨1⟩,2,⟨3,4⟩⟩
   2≡≡⟨5,⟨'c',+,2⟩⟩
   0≡≡⊑⟨-⟩
-⟩⊣𝕩}⍟1 35⥊1
+
+  ⍝ LAYER 4
+  ⍝ [152,183)
+  ≡⟜><'a'
+  ≡⟜><∞
+  ≡⟜>↕5
+  ≡⟜>5‿3⥊2
+  2‿3‿2≡≢>↕2‿3
+  ((4⥊2)⊸⥊≡(>2‿2⥊·<2‿2⥊⊢))"abcd"
+  (⊢≡>∘<)5‿3⥊↕15
+  (⊢≡(><¨))5‿3⥊↕15
+  (⥊≡≍)'a'
+  (⥊≡≍)<'a'
+  (1‿2⊸⥊≡≍)"ab"
+  1‿2≡1≍2
+  2‿1(≍≡2‿2⥊∾)4‿3
+  (≍⟜<≡≍˜)'a'
+  (≍˘˜⥊˘1‿5‿9)≡⌽⎉2⊸+⥊⟜(↕×´)3‿2‿1
+  (↕4)(×⌜≡×⎉0‿2)↕5
+  (↕4)(⋆˜⌜˜≡⋆⎉∞‿¯4)↕5
+  (⟨2⟩⊸∾⍟(2‿2⥊0‿1‿1‿1)2‿3)≡≢¨≍⎉(⌊○(≠≢))⌜˜⟨↕3,2‿3⥊↕6⟩
+  (2=⌜○↕3)≡(2‿4⥊"abc")≡⎉1(2‿3‿4⥊"abc")
+  ⟨0,0⟩≡(2‿4⥊"abc")≡⎉¯1(2‿3‿4⥊"abc")
+  ⟨5,⟨15,1⟩⟩≡+´⚇1⟨⟨3,2⟩,⟨⟨4,5,6⟩,⟨1⟩⟩⟩
+  5‿6‿15≡∾´+´⚇1⟨⟨0,1⟩,⟨⟨⟩⟩⟩⥊⊸∾⚇¯2‿1⟨⟨2,3⟩,⟨4,5,6⟩⟩
+  4≡2+⍟¯1 6
+  (2×↕7)≡2+⍟(¯3+↕7)6
+  (3⌊↕5)≡{i←0⋄r←{i+↩1⋄1+𝕩}⍟(↕4)𝕩⋄r∾i}0
+  (+⌜˜≡·>1+⍟⊢⊢)↕5
+  0‿1‿3‿6‿10≡+`↕5
+  (-0‿1‿3‿6‿10)≡-`↕5
+  ((0∾¨↕3)≍3⥊0)≡≡`↕2‿3
+  ⟨⟩≡×`⟨⟩
+  ≡⟜(!∘0`)3‿0‿2⥊""
 ⟩