Use a simple boolean version of Repeat

1 files changed, 20 insertions, 18 deletions

diff --git a/dzref_full b/dzref_full
index 8eca20a6..ec77a0d7 100755
--- a/dzref_full
+++ b/dzref_full
@@ -14,6 +14,7 @@ impl ← "◶ ← {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}     # LIMITED to numbe
 ○ ← {(𝔾𝕨)𝔽𝔾𝕩}
 ⊸ ← {(𝔽𝕨⊣𝕩)𝔾𝕩}
 ⟜ ← {(𝕨⊣𝕩)𝔽𝔾𝕩}
+⍟ ← {𝕨((𝕨𝔾𝕩)⊑⊢‿𝕗){𝔽}𝕩}   # LIMITED to boolean right operand result
 
 # LIMITED to numeric arguments for scalar cases
 √ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
@@ -44,7 +45,7 @@ _fold←{
 # After defining _perv, we apply it to all scalar functions,
 # making them pervasive. I'm not going to write that out.
 
-ToArray ← IsArray◶<‿⊢
+ToArray ← <⍟(¬IsArray)
 
 ∾ ← {k←≠𝕨⋄k⊸≤◶⟨⊑⟜𝕨⋄-⟜k⊑𝕩˜⟩⌜↕k+≠𝕩}  # LIMITED to two vector arguments
 
@@ -84,9 +85,9 @@ Reshape←{
   ! ∧´Nat¨𝕨
   l←×´𝕨
   n←×´≢𝕩
-  𝕨⥊(l=n)◶{
+  𝕨⥊{
     𝕩(0<n)◶⟨Type⊸(⊣⌜)⋄⥊⊸{⊑⟜𝕨¨n|𝕩}⟩↕l
-  }‿⊢𝕩
+  }⍟(l≠n)𝕩
 }⟜ToArray
 ⥊ ↩ Deshape        ⊘ Reshape
 
@@ -120,11 +121,11 @@ DropV← {⊑⟜𝕩¨𝕨+↕𝕨-˜≠𝕩}
 Cell ← DropV⟜≢
 Pair ← {⟨𝕩⟩} ⊘ {⟨𝕨,𝕩⟩}
 
-Merge←(0<≠∘⥊)◶⊢‿{
+Merge←{
   c←≢⊑𝕩
   ! ∧´⥊(c≡≢)¨𝕩
   𝕩⊑⟜⥊˜⌜c⥊↕×´c
-}
+}⍟(0<≠∘⥊)
 > ↩ Merge          ⊘ >
 ≍ ← >∘Pair
 _ranks ← {⟨2⟩⊘⟨1,0⟩((⊣-1+|)˜⟜≠⊑¨<∘⊢)⥊∘𝔽}
@@ -151,25 +152,15 @@ _scan←{
   ! IsArray 𝕩
   ! 1≤=𝕩
   F←𝔽
-  (0<≠∘⥊)◶⊢‿{
+  {
     r←⥊𝕩 ⋄ l←≠𝕩 ⋄ c←×´1 Cell 𝕩
     {r↩r𝕩_amend˜𝕨F○(⊑⟜r)𝕩}⟜(c⊸+)¨↕c-˜≠r
     (≢𝕩)⥊r
-  }𝕩
-}
-` ← _scan
-_repeat_←{
-  n←𝕨𝔾𝕩
-  f←0⊑𝕨⟨𝔽⟩⊘⟨𝕨𝔽⊢⟩𝕩
-  l←u←0
-  {!Int𝕩⋄l↩l⌊𝕩⋄u↩u⌈𝕩}⚇0 n
-  a←𝕩⋄_p←{𝔽∘⊣`(1+𝕩)⥊<a}
-  pos←F _p u ⋄ neg←F⁼_p-l
-  (|⊑<⟜0⊑pos‿neg˜)⚇0 n
+  }⍟(0<≠∘⥊)𝕩
 }
 
+` ← _scan
 ⎉ ← _rankOp_
-⍟ ← _repeat_
 ˘ ← ⎉¯1
 _insert←{
   ! 1≤=𝕩
@@ -370,6 +361,17 @@ ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
 ∧ ↩ ⍋⊸⊏            ⊘ ∧
 ∨ ↩ ⍒⊸⊏            ⊘ ∨
 ⊒ ← OccurrenceCount⊘ ProgressiveIndexOf
+
+_repeat_←{
+  n←𝕨𝔾𝕩
+  f←0⊑𝕨⟨𝔽⟩⊘⟨𝕨𝔽⊢⟩𝕩
+  l←u←0
+  {!Int𝕩⋄l↩l⌊𝕩⋄u↩u⌈𝕩}⚇0 n
+  a←𝕩⋄_p←{𝔽∘⊣`(1+𝕩)⥊<a}
+  pos←F _p u ⋄ neg←F⁼_p-l
+  (|⊑<⟜0⊑pos‿neg˜)⚇0 n
+}
+⍟ ↩ _repeat_
 "
 
 X←Raw←{≤4}