Support direct application of operators

2 files changed, 12 insertions, 7 deletions

diff --git a/dc.bqn b/dc.bqn
index 22191991..b82cc784 100755
--- a/dc.bqn
+++ b/dc.bqn
@@ -129,15 +129,16 @@ Compile←{
 DParse ← {nv‿r𝕊𝕩:
   l←≠𝕩⋄sep←𝕩∊bS⋄rev←⌽⍋⍋⌽+`(≠↑0∾⊢)⊸∨sep⋄𝕩⊏˜↩rev⋄r⊏˜↩rev
   o←𝕩=1⊑bB⋄g←⍋d←+`o-𝕩=0⊑bB⋄ps←g⊏o∨sep
-  xf←⌽(¬o∨sep)=○(⌈`(1+↕∘≠)⊸×)○⌽1=r
-  𝕩⊏˜↩g⋄r⊏˜↩g⋄v←𝕩≥vi⋄a←𝕩∊2↑bG⋄s←/𝕩∊bS⋄f←(l↑0∾1+g)⊏xf∾0
+  xf←⌽(¬o∨sep)=○(⌈`(1+↕∘≠)⊸×)○⌽(¯1⌽2≤r)∨1≤r
+  𝕩⊏˜↩g⋄r⊏˜↩g⋄v←𝕩≥vi⋄a←𝕩∊2↑bG⋄s←/𝕩∊bS⋄op←r≥2⋄f←(l↑0∾1+g)⊏xf∾0
   tr←ps+`⊸⊏(0∾ps/g)⊏xf
-  tf←tr∧2(|<≤)ps(⊢-⌈`∘×)↕l
-  fa←/(tr<f)∨tf∧a<○(⌈`(1+↕∘≠)⊸×)ps
+  tf←tr∧2(|<≤)ps(⊢-⌈`∘×)+`¬op
+  ro←1⌽r=3⋄os←⌽↕∘≠⊸(⊣-⌈`∘×)⌽¬ro∨¯1⊸⌽⊸∨op
+  oa←⌽/op⋄fa←/ro<((tr∨op)<f∨¯1⌽op)∨tf∧a<○(⌈`(1+↕∘≠)⊸×)ps
   dy←fa⊏1↓0∾˜(tr>tf∨ps)∨v∨f<𝕩=0⊑bB
-  n←𝕩≥vi+nv⋄id←/v-n⋄cn←/n∨𝕩∊bF⋄u←⍷ob←cn⊏𝕩
-  or←⍋g⊏˜∾⟨cn,cn,id,id,1+/a,s,fa+dy⟩
-  bc←or⊏∾⟨0¨cn,u⊐ob,1+(id-1)⊏a,vi-˜id⊏𝕩,(11-⊑bG)+a/𝕩,14¨s,5+dy+4×fa⊏tr⟩
+  n←𝕩≥vi+nv⋄id←/v-n⋄cn←/n∨𝕩≤¯1⊑bC⋄u←⍷ob←cn⊏𝕩
+  or←⍋g⊏˜∾⟨cn,cn,id,id,1+/a,s,oa+1⌈1-˜oa⊏os,fa+dy⟩
+  bc←or⊏∾⟨0¨cn,u⊐ob,1+(id-1)⊏a,vi-˜id⊏𝕩,(11-⊑bG)+a/𝕩,14¨s,5+oa⊏r,5+dy+4×fa⊏tr⟩
   bc‿u
 }
 
diff --git a/test/bcases.bqn b/test/bcases.bqn
index 2b0ea3eb..23fa1257 100644
--- a/test/bcases.bqn
+++ b/test/bcases.bqn
@@ -6,3 +6,7 @@
 3    % DiffSq←+×((-))⋄√5 DiffSq 4
 3    % a←3,2 A 4
 -2   % F←G←-⋄G↩+⋄h←0⊑f∾g⋄H 2
+9    % ט-3
+1    % 3-˜4
+0.25 % 4-˜○÷2
+3    % √5-○(ט)4