From 5cfbc5909bd33b5927f7b1fdb44944819563a385 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Mon, 29 Jun 2020 20:37:51 -0400
Subject: Layer 3 tests

---
 spec/dzref         | 26 ++++++--------------------
 spec/reference.bqn |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'spec')

diff --git a/spec/dzref b/spec/dzref
index 8c41eba4..997e5d58 100755
--- a/spec/dzref
+++ b/spec/dzref
@@ -1,6 +1,7 @@
 #!/usr/bin/env dbqn
 
-impl ← "√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
+impl ← "◶ ← {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}
+√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
 ∧ ←            ×
 ∨ ←            (+-×)
 > ←            (¬≤)
@@ -64,12 +65,6 @@ _perv←{ ⍝ Pervasion
 Int←IsArray◶⟨⌊⊸=,0⟩
 Nat←IsArray◶⟨0⊸≤∧⌊⊸=,0⟩
 
-Range←{
-  I←{!Nat𝕩⋄↕𝕩}
-  M←{!1=≠≢𝕩⋄(<⟨⟩)⥊⊸∾⌜´I¨𝕩}
-  IsArray◶I‿M 𝕩
-}
-
 Pick1←{
   ! 1=≠≢𝕨
   ! 𝕨=○≠s←≢𝕩
@@ -78,23 +73,13 @@ Pick1←{
   𝕨↩𝕨+s×𝕨<0
   (⥊𝕩)⊑˜0(⊑⟜𝕨+⊑⟜s×⊢)´-↕⊸¬≠𝕨
 }
-Pickd←(0∨´IsArray¨∘⊣)◶Pick1‿{Pickd⟜𝕩¨𝕨}
+Pickd←(0∨´⟜⥊IsArray¨∘⊣)◶Pick1‿{Pickd⟜𝕩¨𝕨}
 Pick←IsArray◶⥊‿⊢⊸Pickd
 
-match←{¬∘(0⊑𝕨)◶(1⊑𝕨)‿𝕩}´⟨
-  ⟨≠○IsArray , 0⟩
-  ⟨¬IsArray∘⊢, =⟩
-  ⟨≠○(≠≢)    , 0⟩
-  ⟨0∨´≠○≢    , 0⟩
-  {∧´⥊𝕨Match¨𝕩}
-⟩
-
 Depth←IsArray◶0‿{1+0⌈´Depth¨⥊𝕩}
 
 ⊑ ↩ (0¨∘≢)⊸Pick    ⊘ Pick
-↕ ↩ Range
-
-≡ ← Depth          ⊘ Match
+≡ ← Depth          ⊘ ≡
 
 
 ⍝⌜
@@ -336,7 +321,7 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
   names ← ⥊"AB"∾⌜•a
   f_chr ← "!√∧∨|>≡∾≍↑↓↕⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔"
   m_chr ← "˘¨⌜´`"
-  d_chr ← "⌾⎉⚇⍟"
+  d_chr ← "⌾⎉⚇⍟◶"
   
   f_itr ← 0⥊˜≠f_chr
   m_itr ← 0⥊˜≠m_chr
@@ -373,6 +358,7 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
   '!' Mod_f "{𝕩 ⋄ ≤1}⍟¬"
   '⊑' Mod_f "⊑"
   '↕' Mod_f "↕"
+  '≡' Mod_f "≡"
   
   
   E_isdef ← ⊢ ≢ ("^["∾f_chr∾m_chr∾d_chr∾"] [←↩]")•_R_'_' ⍝ checks if line is a builtin redefinition
diff --git a/spec/reference.bqn b/spec/reference.bqn
index 6b4f9f1f..6ecf59d3 100644
--- a/spec/reference.bqn
+++ b/spec/reference.bqn
@@ -151,7 +151,7 @@ Pick1←{
   𝕨↩𝕨+s×𝕨<0
   (⥊𝕩)⊑˜0(⊑⟜𝕨+⊑⟜s×⊢)´-↕⊸¬≠𝕨
 }
-Pickd←(∨´IsArray¨∘⊣)◶Pick1‿{Pickd⟜𝕩¨𝕨}
+Pickd←(∨´∘⥊IsArray¨∘⊣)◶Pick1‿{Pickd⟜𝕩¨𝕨}
 Pick←IsArray◶⥊‿⊢⊸Pickd
 
 match←{¬∘(0⊑𝕨)◶(1⊑𝕨)‿𝕩}´⟨
-- 
cgit v1.2.3