From 4eeb808545e8dd7ba3a8e0f89af3c875fce88af4 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Mon, 29 Jun 2020 19:49:13 -0400
Subject: Use plain dzaima/BQN when it passes the tests, up to layer 2

---
 spec/dzref       | 54 ++++--------------------------------------------------
 test/testref.bqn |  2 ++
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/spec/dzref b/spec/dzref
index 6efe53f4..8c41eba4 100755
--- a/spec/dzref
+++ b/spec/dzref
@@ -1,27 +1,9 @@
 #!/usr/bin/env dbqn
 
-impl ← "◶ ← {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}     ⍝ LIMITED to number left operand result
-⊘ ← {𝕨((1{𝔽}𝕨)-0)◶𝔽‿𝔾 𝕩}
-⊢ ← {𝕩}
-⊣ ← {𝕩}⊘{𝕨}
-˜ ← {𝕩𝔽𝕨⊣𝕩}
-∘ ← {𝔽𝕨𝔾𝕩}
-○ ← {(𝔾𝕨)𝔽𝔾𝕩}
-⊸ ← {(𝔽𝕨⊣𝕩)𝔾𝕩} ⍝ {(𝔽{(F𝕨)G𝕩}𝔾)˜˜} ⍝ {F←𝔽 ⋄ G←𝔾 ⋄ {(F𝕨)G𝕩}˜˜} ⍝ {(𝔽𝕨)𝔾𝕩}˜˜
-⟜ ← {(𝕨⊣𝕩)𝔽𝔾𝕩} ⍝ {(𝔽{𝕨𝔽𝔾𝕩}𝔾)˜˜} ⍝ {F←𝔽 ⋄ G←𝔾 ⋄ {𝕨F G𝕩}˜˜} ⍝ {𝕨𝔽𝔾𝕩}˜˜
-
-⍝ LIMITED to numeric arguments for scalar cases
-√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
+impl ← "√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
 ∧ ←            ×
 ∨ ←            (+-×)
-¬ ← 1+-
-< ← {⟨⟩⥊⟨𝕩⟩} ⊘ (¬≤˜)
 > ←            (¬≤)
-≥ ← !∘0      ⊘ (≤˜)
-≢ ↩ IsArray◶⟨⟩‿≢  ⍝ LIMITED to monadic case
-Length ← (0<0⊑≢)◶⟨1⋄0⊑⊢⟩∘≢
-≠ ← Length   ⊘ (¬∘=)
-× ↩ 0⊸(<->)  ⊘ ×
 | ← ×⟜×      ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}
 
 _eachm←{
@@ -73,8 +55,6 @@ _eachd←{
 _perv←{ ⍝ Pervasion
   (⊢⊘∨○IsArray)◶⟨𝔽⋄𝔽{𝕨𝔽_perv𝕩}¨⟩
 }
-⌊ ↩ ⌊        ⊘ {(𝕨>𝕩)⊑𝕨‿𝕩} _perv
-⌈ ← -∘⌊∘-    ⊘ {(𝕨<𝕩)⊑𝕨‿𝕩} _perv
 
 
 ⍝⌜
@@ -84,17 +64,6 @@ _perv←{ ⍝ Pervasion
 Int←IsArray◶⟨⌊⊸=,0⟩
 Nat←IsArray◶⟨0⊸≤∧⌊⊸=,0⟩
 
-Deshape←IsArray◶{⟨𝕩⟩}‿⥊
-Reshape←{
-  ! 1≥≠≢𝕨
-  𝕨↩⥊𝕨
-  ! ∧´Nat¨𝕨
-  n←≠𝕩 ⋄ l←1×´𝕨
-  ! n≤○(0⊸=)l
-  𝕨⥊⊑⟜𝕩¨n|↕l
-}⟜Deshape
-⥊ ↩ Deshape        ⊘ Reshape
-
 Range←{
   I←{!Nat𝕩⋄↕𝕩}
   M←{!1=≠≢𝕩⋄(<⟨⟩)⥊⊸∾⌜´I¨𝕩}
@@ -124,10 +93,8 @@ Depth←IsArray◶0‿{1+0⌈´Depth¨⥊𝕩}
 
 ⊑ ↩ (0¨∘≢)⊸Pick    ⊘ Pick
 ↕ ↩ Range
-◶ ↩ {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}  ⍝ Same definition, new Pick
 
 ≡ ← Depth          ⊘ Match
-≢ ↩ ≢              ⊘ (¬Match)
 
 
 ⍝⌜
@@ -367,9 +334,9 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
 
 {
   names ← ⥊"AB"∾⌜•a
-  f_chr ← "!+-×÷⋆√⌊⌈∧∨¬|=≠≤<>≥≡≢⊣⊢⥊∾≍↑↓↕⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔"
-  m_chr ← "˜˘¨⌜⁼´`"
-  d_chr ← "∘⊸⟜○⌾⎉⚇⍟◶⊘"
+  f_chr ← "!√∧∨|>≡∾≍↑↓↕⌽⍉/⍋⍒⊏⊑⊐⊒∊⍷⊔"
+  m_chr ← "˘¨⌜´`"
+  d_chr ← "⌾⎉⚇⍟"
   
   f_itr ← 0⥊˜≠f_chr
   m_itr ← 0⥊˜≠m_chr
@@ -396,16 +363,6 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
   ⍝ built-in assumptions
   
   Mod_f ← ⍎{𝔽 (Name_f 𝕨) ∾ " ↩ " ∾ 𝕩}
-  Mod_m ← ⍎{𝔽 (Name_m 𝕨) ∾ " ↩ " ∾ 𝕩}
-  
-  '+' Mod_f "+"
-  '-' Mod_f "-"
-  '×' Mod_f "×"
-  '÷' Mod_f "÷"
-  '⋆' Mod_f "⋆"
-  '⌊' Mod_f "⌊"
-  '=' Mod_f "="
-  '≤' Mod_f "≤"
   
   
   ⍎"IsArray ← 0≠≡"
@@ -414,11 +371,8 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
   ⍎"Type    ← ⟨⟩⥊0⊸⥊"
   
   '!' Mod_f "{𝕩 ⋄ ≤1}⍟¬"
-  '≢' Mod_f "≢"
-  '⥊' Mod_f "⥊"
   '⊑' Mod_f "⊑"
   '↕' Mod_f "↕"
-  '⁼' Mod_m "⁼"
   
   
   E_isdef ← ⊢ ≢ ("^["∾f_chr∾m_chr∾d_chr∾"] [←↩]")•_R_'_' ⍝ checks if line is a builtin redefinition
diff --git a/test/testref.bqn b/test/testref.bqn
index 635514dc..dfcf739a 100644
--- a/test/testref.bqn
+++ b/test/testref.bqn
@@ -77,6 +77,8 @@
   1≡¬0
   2≡¬¯1
   0≡3¬4
+⟩⊣𝕩}0
+{⟨
   2≡4¬3
   4≡5¬2
   0≡|0
-- 
cgit v1.2.3