Tests and fixes for layer 5

3 files changed, 65 insertions, 15 deletions

diff --git a/spec/dzref b/spec/dzref
index 00f6c85e..99d8789d 100755
--- a/spec/dzref
+++ b/spec/dzref
@@ -165,7 +165,7 @@ JoinTo←{
   s←𝕨Pair○≢𝕩
   a←1⌈´k←≠¨s
   ! ∧´1≥a-k
-  c←(a-k)+⟜(↕a-1)⊸⊏¨s
+  c←(k¬a)+⟜(↕a-1)⊸⊏¨s
   ! ≡´c
   l←+´(a=k)⊣◶1‿(⊑⊢)¨s
   (⟨l⟩∾⊑c)⥊𝕨∾○⥊𝕩
@@ -175,18 +175,19 @@ Take←{
   T←{
     ! Int 𝕨
     l←≠𝕩
-    i←((𝕨<0)×𝕨+l)+↕|𝕨
-    ((l+1)|¯1⌈l⌊i)⊏𝕩 JoinTo (1 Cell 𝕩)⥊Type 𝕩
+    i←(l+1)|¯1⌈l⌊((𝕨<0)×𝕨+l)+↕|𝕨
+    i⊏JoinTo⟜(1⊸Cell⥊Type)⍟(0∨´l=i)𝕩
   }
   𝕨 T _onAxes_ 0 (⟨1⟩⥊˜0⌈𝕨-○≠⊢)⊸∾∘≢⊸⥊𝕩
 }
 Prefixes ← {!1≤≠≢𝕩 ⋄ (↕1+≠𝕩)Take¨<𝕩}
 ↑ ← Prefixes       ⊘ Take
 Drop←{
-  s←(≠𝕨)(⊣↑⊢∾⥊˜0⌈-⟜≠)≢𝕩
+  s←(≠𝕨)(⊣↑⊢∾˜1⥊˜0⌈-⟜≠)≢𝕩
   ((sׯ1⋆𝕨>0)+(-s)⌈s⌊𝕨)↑𝕩
 }
 Suffixes ← {!1≤≠≢𝕩 ⋄ (↕1+≠𝕩)Drop¨<𝕩}
+↓ ← Suffixes       ⊘ Drop
 
 Windows←{
   ! IsArray 𝕩
@@ -194,12 +195,12 @@ Windows←{
   ! 𝕨≤○≠≢𝕩
   ! ∧´Nat¨⥊𝕨
   s←(≠𝕨)↑≢𝕩
-  ! ∧´𝕨≤s
-  ><¨⊸⊏⟜𝕩¨s(¬+⌜○↕⊢)⥊𝕨
+  ! ∧´𝕨≤1+s
+  𝕨{(∾⟜(𝕨≠⊸↓≢𝕩)∘≢⥊>)<¨⊸⊏⟜𝕩¨s(¬+⌜○↕⊢)⥊𝕨}⍟(0<≠𝕨)𝕩
 }
 
 Reverse ← {!1≤≠≢𝕩 ⋄ (-↕⊸¬≠𝕩)⊏𝕩}
-Rotate ← {!Nat𝕨 ⋄ l←≠𝕩⋄(l|𝕨+↕l)⊏𝕩} _onAxes_ 0
+Rotate ← {!Int𝕨 ⋄ l←≠𝕩⋄(l|𝕨+↕l)⊏𝕩} _onAxes_ 0
 
 Indices←{
   ! 1=≠≢𝕩
@@ -209,7 +210,6 @@ Indices←{
 Rep ← Indices⊸⊏
 Replicate ← {0<≠≢𝕨}◶(⥊˜⟜≠Rep⊢)‿{!𝕨=○≠𝕩⋄𝕨Rep𝕩} _onAxes_ (1-0=≠)
 
-↓ ← Suffixes       ⊘ Drop
 ↕ ↩ ↕              ⊘ Windows
 ⌽ ← Reverse        ⊘ Rotate
 / ← Indices        ⊘ Replicate
diff --git a/spec/reference.bqn b/spec/reference.bqn
index 5a6ab5ab..9c82cda1 100644
--- a/spec/reference.bqn
+++ b/spec/reference.bqn
@@ -269,7 +269,7 @@ JoinTo←{
   s←𝕨Pair○≢𝕩
   a←1⌈´k←≠¨s
   ! ∧´1≥a-k
-  c←(a-k)+⟜(↕a-1)⊸⊏¨s
+  c←(k¬a)+⟜(↕a-1)⊸⊏¨s
   ! ≡´c
   l←+´(a=k)⊣◶1‿(⊑⊢)¨s
   (⟨l⟩∾⊑c)⥊𝕨∾○⥊𝕩
@@ -279,13 +279,13 @@ Take←{
   T←{
     ! Int 𝕨
     l←≠𝕩
-    i←((𝕨<0)×𝕨+l)+↕|𝕨
-    ((l+1)|¯1⌈l⌊i)⊏𝕩 JoinTo (1 Cell 𝕩)⥊Type 𝕩
+    i←(l+1)|¯1⌈l⌊((𝕨<0)×𝕨+l)+↕|𝕨
+    i⊏JoinTo⟜(1⊸Cell⥊Type)⍟(∨´l=i)𝕩
   }
   𝕨 T _onAxes_ 0 (⟨1⟩⥊˜0⌈𝕨-○≠⊢)⊸∾∘≢⊸⥊𝕩
 }
 Drop←{
-  s←(≠𝕨)(⊣↑⊢∾⥊˜0⌈-⟜≠)≢𝕩
+  s←(≠𝕨)(⊣↑⊢∾˜1⥊˜0⌈-⟜≠)≢𝕩
   ((sׯ1⋆𝕨>0)+(-s)⌈s⌊𝕨)↑𝕩
 }
 Prefixes ← {!1≤≠≢𝕩 ⋄ (↕1+≠𝕩)Take¨<𝕩}
@@ -297,12 +297,12 @@ Windows←{
   ! 𝕨≤○≠≢𝕩
   ! ∧´Nat¨⥊𝕨
   s←(≠𝕨)↑≢𝕩
-  ! ∧´𝕨≤s
-  ><¨⊸⊏⟜𝕩¨s(¬+⌜○↕⊢)⥊𝕨
+  ! ∧´𝕨≤1+s
+  𝕨{(∾⟜(𝕨≠⊸↓≢𝕩)∘≢⥊>)<¨⊸⊏⟜𝕩¨s(¬+⌜○↕⊢)⥊𝕨}⍟(0<≠𝕨)𝕩
 }
 
 Reverse ← {!1≤≠≢𝕩 ⋄ (-↕⊸¬≠𝕩)⊏𝕩}
-Rotate ← {!Nat𝕨 ⋄ l←≠𝕩⋄(l|𝕨+↕l)⊏𝕩} _onAxes_ 0
+Rotate ← {!Int𝕨 ⋄ l←≠𝕩⋄(l|𝕨+↕l)⊏𝕩} _onAxes_ 0
 
 Indices←{
   ! 1=≠≢𝕩
diff --git a/test/testref.bqn b/test/testref.bqn
index bedfbfe0..62758027 100644
--- a/test/testref.bqn
+++ b/test/testref.bqn
@@ -201,4 +201,54 @@
   ((0∾¨↕3)≍3⥊0)≡≡`↕2‿3
   ⟨⟩≡×`⟨⟩
   ≡⟜(!∘0`)3‿0‿2⥊""
+
+  ⍝ LAYER 5
+  ⍝ [183,230)
+  (<'a')≡⊏"abc"
+  "a"≡⊏⥊˘"abc"
+  (<'c')≡2⊏"abc"
+  (<'c')≡¯1⊏"abc"
+  "ccc"≡2‿¯1‿2⊏"abc"
+  ((3-˜↕5)⊸⊏≡2⊸⌽)↕5‿2
+  (0‿3⥊0)≡⟨⟩⊏2‿3⥊↕6
+  ⟨3‿0,2‿1‿2⟩(×⟜5⊸+⌜´∘⊣≡⊏)⥊⟜(↕×´)6‿5
+  (2‿0⥊0)≡⟨3‿¯1,⟨⟩⟩⊏4‿3⥊0
+  5‿1(<⊸⊏≡⊏)↕6‿2
+  ⟨4‿0,1‿2‿3‿2‿1‿0⟩(+⌜´⊸(×⌜)≡⊏⟜(×⌜˜))+⌜˜↕5
+  "abc"≡3↑"abce"
+  "e"≡¯1↑"abce"
+  ""≡0↑"ab"
+  (<⟜3⊸×↕5)≡5↑↕3
+  (6⥊0)≡¯6↑↕0
+  (≍↕3)≡1↑2‿3⥊↕6
+  (↑⟜4≡⥊⟜0)↕3
+  (≍"abc")≡1↑2‿3↑"abcd"
+  (6⥊1)(↑≡⥊⟜⊑)2‿3⥊↕6
+  (↕¨∘↕∘(1⊸+)≡↑∘↕)5
+  (↑≡((↕4)≍¨2)⥊¨<)3‿2⥊"abcdef"
+  "d"≡3↓"abcd"
+  1‿2≡⟜(¯3⊸↓)○↕4‿2
+  1‿1‿3‿2‿1≡≢(5⥊0)↓↕3‿2‿1
+  (↓∘↕≡↕∘(1⊸+)+⟜⌽↑∘↕)5
+  (↕3‿4)≡1↓¨⊏↕2‿3‿4
+  (4+⌜○↕2)≡2↕↕5
+  ⟨⟩(↕≡⊢)4‿3⥊"abcd"
+  (0⊸↕≡(0≍˜1+≠)⊸⥊)↕6
+  (7↕6‿0⥊"")≡0‿7‿0⥊""
+  ≡⟜⌽⟨⟩
+  ≡⟜⌽"a"
+  "ba"≡⟜⌽"ab"
+  (⌽≡(1-˜≠)(-○⊑∾1↓⊢)⚇1⊢)↕3‿2‿4
+  ≡⟜⌽↕↕3
+  ∧´5(⌽≡⊢)¨⟨"",⥊∞,↕5,↕0‿4,2‿0‿3⥊""⟩
+  ∧´("bcdea"≡⌽⟜"abcde")¨1+5ׯ10‿¯2‿¯1‿0‿1‿6‿61
+  ∧´⟨1,0‿2,¯1‿1‿3⟩(⊑∘⌽≡(3⊸↑)⊸⊑)⚇¯1‿∞ 2‿3‿5⥊"abcdef"
+  ⟨⟩(⌽≡⊢)'a'
+  0‿4≡/1‿0‿0‿0‿1‿0
+  1‿1‿2≡/0‿2‿1
+  ≡⟜/⟨⟩
+  "aabbcc"≡2/"abc"
+  3‿3‿3‿2‿2‿1≡/˜3‿2‿1
+  (≍1∾¨1‿2‿2)≡(↕¨/↕)2‿3
+  ⟨⟩(/≡⊢)≍"ab"
 ⟩