From 1c31061b995bf769f9cd97eef616424d3709a2fa Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Tue, 11 Aug 2020 22:38:32 -0400
Subject: Improve pervasive primitive definition order

---
 src/r.bqn | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/r.bqn b/src/r.bqn
index 054e6421..f2c688d1 100644
--- a/src/r.bqn
+++ b/src/r.bqn
@@ -150,24 +150,24 @@ Merge←{
   𝕩⊑⟜Deshape˜⌜c⥊↕1×´c
 }⍟(0<≠∘⥊)⍟IsArray
 
-+ ↩ + _perv
-- ↩ - _perv
-× ↩ (0⊸(<->) ⊘ ×) _perv
 ÷ ↩ ÷ _perv
 ⋆ ↩ ⋆ _perv
 √ ← ⋆⟜(÷2)   ⊘ (⋆⟜÷˜)
-| ← (×⟜×     ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}) _perv
+| ← (0⊸≤◶-‿⊢ ⊘ {𝕩-𝕨×⌊𝕩÷𝕨}) _perv
 ⌊ ↩ (⌊       ⊘ {(𝕨>𝕩)⊑𝕨‿𝕩}) _perv
 ⌈ ↩ (-∘⌊∘-   ⊘ {(𝕨<𝕩)⊑𝕨‿𝕩}) _perv
-¬ ← 1+-
-∧ ←            ×
-∨ ←            (+-×)
+∧ ←            × _perv
+∨ ←            (+-×) _perv
+× ↩ (0⊸(<->) ⊘ ×) _perv
 < ↩ {⟨⟩⥊⟨𝕩⟩} ⊘ ((1-≤˜) _perv)
 > ↩ Merge    ⊘ ((1-≤) _perv)
 ≠ ↩ ≠        ⊘ ((1-=) _perv)
 = ↩ =        ⊘ (= _perv)
 ≥ ← !∘0      ⊘ (≤˜_perv)
 ≤ ↩ !∘0      ⊘ (≤ _perv)
++ ↩ + _perv
+- ↩ - _perv
+¬ ← 1+-
 identity ← (0⊑⟨!∘0⟩) {(0⊑𝕨){𝕗=𝕩}◶𝕩‿(1⊑𝕨)}´ ⟨+‿0,-‿0,×‿1,÷‿1,⋆‿1,√‿1,∧‿1,∨‿0,|‿0,⌊‿∞,⌈‿¯∞,<‿0,≤‿1,=‿1,≥‿1,>‿0,≠‿0⟩
 
 Deshape←IsArray◶{⟨𝕩⟩}‿⥊
-- 
cgit v1.2.3