aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Lochbaum <mwlochbaum@gmail.com>2020-07-14 10:11:16 -0400
committerMarshall Lochbaum <mwlochbaum@gmail.com>2020-07-14 10:11:16 -0400
commitd2b9c0d776de4f0701ed8aa9805d4edaa4a1f66e (patch)
tree3d22bd1cb9ad4af961d5fec63e5289f7933349a2
parent6a418c293c1977904be4e8f6a2b523ae975ba72c (diff)
Remove separators inside braces or brackets during tokenization
-rwxr-xr-xdc.bqn2
-rw-r--r--test/bcases.bqn1
2 files changed, 2 insertions, 1 deletions
diff --git a/dc.bqn b/dc.bqn
index 5874ac40..7dbbbb67 100755
--- a/dc.bqn
+++ b/dc.bqn
@@ -41,7 +41,7 @@ Tokenize←{
id←⍷args∾(bA∊˜w/c)⍒⊸⊏in⋄nv←+´bA∊˜⊑¨id
c↩(w∨¬l∨c∊bP∾bW)/(vi+id⊐in)⌾(w⊸/)(vi+(≠id)+lu⊐lit)⌾(cl⊸/)c
- c/˜↩¬(1⌾⊑1⌽1⌾⊑)⊸∧c∊bS
+ c/˜↩¬(≠↑1∾(c∊2‿4⊏bB)∨⊢)⊸∧c∊bS⋄c/˜↩¬(1↓1∾˜c∊3‿5⊏bB)∧c∊bS
ti←(us=¯1⊸⊑¨i)(⊢+∧⟜(2⊸=))0⌈na⌊∘÷˜(⊑bA)-˜⊑¨i
t←ti⌾(((0⊸≤∧<⟜(≠id))c-vi)⊸/)(vi⌊c)⊏charRole
⟨c,t,nv,nv-≠args,(nv↓id)∾lu⟩
diff --git a/test/bcases.bqn b/test/bcases.bqn
index 518a37ff..5c4aed29 100644
--- a/test/bcases.bqn
+++ b/test/bcases.bqn
@@ -14,6 +14,7 @@
8 % _m←˜⋄+_m 4
8 % _c_←⊸ , 4 _c_ × 2
↕2 % ⟨0,1⟩
+↕2 % ⟨⋄0,⋄1⋄⋄⟩
1 % l←⟨2×3⋄5⟩⋄-´l
1 % -´⟨2×3⋄5⟩
2 % (4-⟨0,1⟩×2)⊑˜1