aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Lochbaum <mwlochbaum@gmail.com>2020-07-11 16:55:02 -0400
committerMarshall Lochbaum <mwlochbaum@gmail.com>2020-07-11 16:59:24 -0400
commitb83e3e3aa51c2e96e9dc2987a41fe8f2bb38f262 (patch)
treeadca236f923c9f99786c4996033c43c012472bdf
parent63a2cafaf5faa8d4337bf045d58df9fa1e7cf7f8 (diff)
Minor cleanup
-rwxr-xr-xdc.bqn10
1 files changed, 5 insertions, 5 deletions
diff --git a/dc.bqn b/dc.bqn
index 8d751a37..ce5183a1 100755
--- a/dc.bqn
+++ b/dc.bqn
@@ -138,17 +138,17 @@ DParse ← {nv‿r𝕊𝕩:
g←⍋+`p←bB(⊣(≠⊸>ׯ1⋆2|⊢)⊐)𝕩
r+↩(𝕩=1⊑bB)(⊣∧¬⊸∨=○(⌈`(1+↕∘≠)⊸×)⊢)(¯1⊸⌽⌾(g⊸⊏)3=r)∨1≤r
rev←p‿g RevE𝕩⋄g↩⍋+`rev⊏p
- gr←g⊏rev⋄𝕩⊏˜↩gr⋄r⊏˜↩gr⋄p⊏˜↩gr
- s←𝕩∊bS⋄o←p>0⋄ps←s∨o⋄a←𝕩∊2↑bG⋄r-↩ps∨a
- v←𝕩≥vi⋄op←r≥2⋄ro←1⌽r=3
+ gr←g⊏rev⋄𝕩⊏˜↩gr⋄r⊏˜↩gr⋄o←gr⊏p>0
+ s←𝕩∊bS⋄ps←s∨o⋄a←𝕩∊2↑bG
+ r-↩ps∨a⋄op←r≥2⋄ro←1⌽r=3
tr←(⌈`↕∘≠⊸ׯ1⌽ps)⊏r≥1
tf←(a≤○(⌈`(1+↕∘≠)⊸×)ps)∧tr∧2(|<≤)ps(⊢-⌈`∘×)+`¬ro∨op
opa←op>1↓0∾˜ps∨a⋄os←⌽↕∘≠⊸(⊣-⌈`∘×)⌽¬ro∨¯1⊸⌽⊸∨op
oa←⌽/opa⋄fa←/(ro∧1⌽opa)<((tr∨op)<(r=1)∨¯1⌽opa)∨tf
dy←fa⊏1↓0∾˜((r≥0)∧tr>tf)∨r=0
- n←𝕩≥vi+nv⋄id←/v-n⋄cn←/n∨𝕩≤¯1⊑bC⋄u←⍷ob←cn⊏𝕩
+ n←𝕩≥vi+nv⋄id←/n<𝕩≥vi⋄cn←/n∨𝕩≤¯1⊑bC⋄u←⍷ob←cn⊏𝕩
lo←(o/𝕩)=4⊑bB⋄l←/𝕩=5⊑bB⋄ll←1+lo/1(↓--⊸↓)(o∾1)/+`s∾0
- dr←/s>(+`o)⊏0∾lo
+ dr←/s>o+`⊸⊏0∾lo
or←⍋g⊏˜∾⟨cn,cn,id,id,1+/a,dr,l,l,oa+1⌈1-˜oa⊏os,fa+dy⟩
bc←or⊏∾⟨0¨cn,u⊐ob,1+(id-1)⊏a,vi-˜id⊏𝕩,(11-⊑bG)+a/𝕩
14¨dr,3¨l,ll,5+oa⊏r,5+dy+4×fa⊏tr⟩