From ca1dec7cddac8a40069df880e76b1f237c070727 Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Sat, 11 Jul 2020 14:38:27 -0400 Subject: Fix handling of compositions in trains --- dc.bqn | 8 ++++---- test/bcases.bqn | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dc.bqn b/dc.bqn index 1b45ea52..ebe71811 100755 --- a/dc.bqn +++ b/dc.bqn @@ -139,12 +139,12 @@ DParse ← {nv‿r𝕊𝕩: f←(𝕩≠1⊑bB)(∨=○(⌈`(1+↕∘≠)⊸×)⊢)(¯1⊸⌽⌾(g⊸⊏)3=r)∨1≤r rev←p‿g RevE𝕩⋄g↩⍋+`rev⊏p gr←g⊏rev⋄𝕩⊏˜↩gr⋄r⊏˜↩gr⋄p⊏˜↩gr⋄f⊏˜↩gr - v←𝕩≥vi⋄a←𝕩∊2↑bG⋄op←r≥2 + v←𝕩≥vi⋄a←𝕩∊2↑bG⋄op←r≥2⋄ro←1⌽r=3 s←𝕩∊bS⋄o←p>0⋄ps←s∨o⋄lc←𝕩=5⊑bB tr←(⌈`↕∘≠⊸ׯ1⌽ps)⊏f - tf←tr∧2(|<≤)ps(⊢-⌈`∘×)+`¬op - opa←op>1↓0∾˜ps∨a⋄os←⌽↕∘≠⊸(⊣-⌈`∘×)⌽¬(1⌽r=3)∨¯1⊸⌽⊸∨op - oa←⌽/opa⋄fa←/(1⌽opa∧r=3)<((tr∨op)1↓0∾˜ps∨a⋄os←⌽↕∘≠⊸(⊣-⌈`∘×)⌽¬ro∨¯1⊸⌽⊸∨op + oa←⌽/opa⋄fa←/(ro∧1⌽opa)<((tr∨op)tf∨ps)∨v∨lc∨f<𝕩=1⊑bB n←𝕩≥vi+nv⋄id←/v-n⋄cn←/n∨𝕩≤¯1⊑bC⋄u←⍷ob←cn⊏𝕩 lo←(o/𝕩)=4⊑bB⋄l←/lc⋄ll←1+lo/1(↓--⊸↓)(o∾1)/+`s∾0 diff --git a/test/bcases.bqn b/test/bcases.bqn index 1d6d5d14..f3a6db0a 100644 --- a/test/bcases.bqn +++ b/test/bcases.bqn @@ -16,3 +16,4 @@ 1 % l←⟨2×3⋄5⟩⋄-´l 1 % -´⟨2×3⋄5⟩ 2 % (4-⟨0,1⟩×2)⊑˜1 +16 % 3(2×+⍟(1+1))2 -- cgit v1.2.3