Rename variables

1 files changed, 12 insertions, 13 deletions

diff --git a/c.bqn b/c.bqn
index 13a1c4e0..d0d9de40 100755
--- a/c.bqn
+++ b/c.bqn
@@ -35,21 +35,20 @@ tab2←MakeTab⟨
 ⟩
 
 Tokenize←{
-  args←charSet⊸⊐¨𝕨⋄x←charSet⊐𝕩
-  x(/˜)↩¬<○(⌈`↕∘≠⊸×)´((⊑bS)∾bR)=⌜x
-  w←(<´≠↕0∾⊢)wc←x∊∾bD‿bN‿bA
-  id←∪args∾(bA∊˜w/x)⍒⊸⊏ids←(1-˜wc×+`w)⊔x
-  nVar←>+´bA∊˜⊑¨id
-  x↩(w∨¬wc∨x∊bW)/(vi+id⊐ids)⌾(w⊸/)x
-  x(/˜)↩¬(1⌾⊑1⌽1⌾⊑)⊸∧x∊bS
-  ⟨x,nVar,nVar-≠args,nVar↓id⟩
+  args←charSet⊸⊐¨𝕨⋄c←charSet⊐𝕩
+  c(/˜)↩¬<○(⌈`↕∘≠⊸×)´((⊑bS)∾bR)=⌜c
+  w←(<´≠↕0∾⊢)l←c∊∾bD‿bN‿bA
+  id←∪args∾(bA∊˜w/c)⍒⊸⊏i←(1-˜l×+`w)⊔c
+  nv←>+´bA∊˜⊑¨id
+  c↩(w∨¬l∨c∊bW)/(vi+id⊐i)⌾(w⊸/)c
+  c(/˜)↩¬(1⌾⊑1⌽1⌾⊑)⊸∧c∊bS
+  ⟨c,nv,nv-≠args,nv↓id⟩
 }
 
 Parse←{
-  x←𝕩
-  a←x∊(2↑bG)⋄at←1⌽a⋄x(/˜)↩¬a⋄a(/˜)↩¬at
-  l←≠x⋄sep←x∊bS⋄x↩(bF⊑˜chF⊐<'⊣')¨⌾(sep⊸/)x
-  o←x=0⊑bB⋄c←x=1⊑bB⋄v←a-˜x≥vi⋄f←¬o∨c∨v∨sep
+  a←𝕩∊(2↑bG)⋄at←1⌽a⋄𝕩(/˜)↩¬a⋄a(/˜)↩¬at
+  l←≠𝕩⋄sep←𝕩∊bS⋄𝕩↩(bF⊑˜chF⊐<'⊣')¨⌾(sep⊸/)𝕩
+  o←𝕩=0⊑bB⋄c←𝕩=1⊑bB⋄v←a-˜𝕩≥vi⋄f←¬o∨c∨v∨sep
   na←(2×sep)+f×1+l↑0∾c∨v
   e←/c⋄d←+`o-c
   ed←e⊏d⋄b←(⍋⍋ed)⊏(⍋⊏⟜d)⊸⊏/o
@@ -58,7 +57,7 @@ Parse←{
   fe⌊↩(l-1)-l↑(⌈`↕∘≠⊸×)⌾⌽1∾˜sep
   ia←+`l↑0∾f-l↑/⁼∧f/fe
   sel←¬∘⊏⟜(o∨c)⊸/⍋(fe⌈↕l)-ia
-  sel⊸⊏¨x‿na
+  sel⊸⊏¨𝕩‿na
 }
 
 GenNum←{