Explicit pervasion in impl.bqn

1 files changed, 26 insertions, 20 deletions

diff --git a/impl.bqn b/impl.bqn
index 2285f66e..a5889def 100644
--- a/impl.bqn
+++ b/impl.bqn
@@ -10,18 +10,10 @@
 ⍟ ← {𝕨((𝕨𝔾𝕩)⊑⊢‿𝕗){𝔽}𝕩}   # LIMITED to boolean right operand result
 
 # LIMITED to numeric arguments for scalar cases
-√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
-∧ ←            ×
-∨ ←            (+-×)
-¬ ← 1+-
-< ← {⟨⟩⥊⟨𝕩⟩} ⊘ (¬≤˜)
-> ←            (¬≤)
-≥ ← !∘0      ⊘ (≤˜)
+< ← {⟨⟩⥊⟨𝕩⟩} ⊘ (1-≤˜)
+> ←            (1-≤)
 ≢ ↩ IsArray◶⟨⟩‿≢  # LIMITED to monadic case
-Length ← (0<0⊑≢)◶⟨1⋄0⊑⊢⟩∘≢
-≠ ← Length   ⊘ (¬∘=)
-× ↩ 0⊸(<->)  ⊘ ×
-| ← ×⟜×      ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}
+≠ ← (0<=)◶⟨1⋄0⊑≢⟩
 
 _fold←{
   ! 1==𝕩
@@ -35,18 +27,16 @@ _fold←{
 
 #⌜
 # LAYER 2: Pervasion
-# After defining _perv, we apply it to all scalar functions,
-# making them pervasive. I'm not going to write that out.
 
-ToArray ← <⍟(¬IsArray)
+ToArray ← <⍟(1-IsArray)
 
 ∾ ← {k←≠𝕨⋄k⊸≤◶⟨⊑⟜𝕨⋄-⟜k⊑𝕩˜⟩⌜↕k+≠𝕩}  # LIMITED to two vector arguments
 
 _eachd←{
   _e←{ # 𝕨 has smaller or equal rank
     k←≠p←≢𝕨 ⋄ q←≢𝕩
-    ! ∧´(⊑⟜p=⊑⟜q)⌜↕k
-    l←×´(q⊑˜k⊸+)⌜↕q≠⊸-k
+    ! 1×´(⊑⟜p=⊑⟜q)⌜↕k
+    l←1×´(q⊑˜k⊸+)⌜↕q≠⊸-k
     a←⥊𝕨 ⋄ b←⥊𝕩
     q⥊⥊(≠a) (⊑⟜a𝔽l⊸×⊸+⊑b˜)⌜○↕ l
   }
@@ -56,12 +46,28 @@ _eachd←{
 ¨ ↩ {(𝔽⌜)⊘(𝔽_eachd○ToArray)}
 
 _perv←{ # Pervasion
-  (⊢⊘∨○IsArray)◶⟨𝔽⋄𝔽{𝕨𝔽_perv𝕩}¨⟩
+  (⊢⊘(+-×)○IsArray)◶⟨𝔽⋄𝔽{𝕨𝔽_perv𝕩}¨⟩
 }
-⌊ ↩ ⌊        ⊘ ({(𝕨>𝕩)⊑𝕨‿𝕩} _perv)
-⌈ ← -∘⌊∘-    ⊘ ({(𝕨<𝕩)⊑𝕨‿𝕩} _perv)
 
-identity ← {(0⊑𝕨){𝕗=𝕩}◶𝕩‿(1⊑𝕨)}´ ⟨+‿0,-‿0,×‿1,÷‿1,⋆‿1,√‿1,∧‿1,∨‿0,|‿0,⌊‿∞,⌈‿¯∞,<‿0,≤‿1,=‿1,≥‿1,>‿0,≠‿0,⊑⟨!∘0⟩⟩
++ ↩ + _perv
+- ↩ - _perv
+× ↩ (0⊸(<->) ⊘ ×) _perv
+÷ ↩ ÷ _perv
+⋆ ↩ ⋆ _perv
+√ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
+⌊ ↩ (⌊       ⊘ {(𝕨>𝕩)⊑𝕨‿𝕩}) _perv
+⌈ ← (-∘⌊∘-   ⊘ {(𝕨<𝕩)⊑𝕨‿𝕩}) _perv
+| ← (×⟜×     ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}) _perv
+¬ ← 1+-
+∧ ←            ×
+∨ ←            (+-×)
+< ↩ {⟨⟩⥊⟨𝕩⟩} ⊘ ((¬≤˜) _perv)
+> ↩            > _perv
+≠ ↩ ≠        ⊘ (¬∘= _perv)
+= ↩ =        ⊘ (= _perv)
+≤ ↩ !∘0      ⊘ (≤ _perv)
+≥ ← !∘0      ⊘ (≤˜_perv)
+identity ← {(0⊑𝕨){𝕗=𝕩}◶𝕩‿(1⊑𝕨)}´ ⟨+‿0,-‿0,×‿1,÷‿1,⋆‿1,√‿1,∧‿1,∨‿0,|‿0,⌊‿∞,⌈‿¯∞,<‿0,≤‿1,=‿1,≥‿1,>‿0,≠‿0,0⊑⟨!∘0⟩⟩
 
 
 #⌜