aboutsummaryrefslogtreecommitdiff
path: root/src/c.bqn
diff options
context:
space:
mode:
Diffstat (limited to 'src/c.bqn')
-rw-r--r--src/c.bqn13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/c.bqn b/src/c.bqn
index 29e8aec4..943695de 100644
--- a/src/c.bqn
+++ b/src/c.bqn
@@ -162,7 +162,7 @@ Parse ← {r‿vn‿i‿e←𝕨⋄nv←≠vn
ir(×⟜¬-⊢)↩nr # Include nothingness (doesn't handle 𝕎)
# Prep for lexical resolution before reordering 𝕩
- idv←𝕩⊏˜id←/idm←(0⊸≤∧<⟜nv)xv←𝕩-vi
+ idv←xv⊏˜id←/idm←(0⊸≤∧<⟜nv)xv←𝕩-vi
# Parsing part 1
p-↩br⋄g↩⍋+`p⋄gr←g⊏rev # Order by non-brace bracket depth
@@ -171,7 +171,6 @@ Parse ← {r‿vn‿i‿e←𝕨⋄nv←≠vn
{i↩(𝕨⊏i)⌾(𝕩⊸⊏)i⋄e↩(𝕩⊏e)⌾(𝕨⊸⊏)e}´bp # Highlight all contents of a pair when error reporting
g⊏˜↩gs←⍋gr⊏sl⋄gr↩g⊏rev⋄gi←⍋g # Send strand prefixes *‿ to the end
𝕩⊏˜↩g⋄r⊏˜↩gr⋄ir⊏˜↩gr⋄l↩(l⊏⍋gs)∾/gr⊏sr>sl
- bk←c⊏gi # Block loads
a←r≤¯3⋄ps←a<r<0 # a: assignment, ps: part separator
tr←1≤er←ir⊏˜IT»ps # er: expression role; tr: train or modifier expression
no←ir<0⋄ne←er<0 # Nothing value; expression
@@ -190,18 +189,19 @@ Parse ← {r‿vn‿i‿e←𝕨⋄nv←≠vn
"Can't use result of function/modifier assignment without parentheses"_err_(G) (0<er)∧(0≤r)∧»⊸>aa
# Lexical resolution (independent of parsing part 2 below)
- ip←id⊏ac⋄d←ip M 2‿2⋄xm←ip M 1‿2 # Assignment classes; which are definitions, exports
- idn←(idg←(d/id⊏fi)∾≠fsc)⊔vi-˜d/idv # Numbers for each identifier, per-block
+ ip←id⊏ac⋄d←id⊏dd←ac M 2‿2⋄xm←ip M 1‿2 # Assignment classes; which are definitions, exports
+ "Can't define special name"_err_(SP) sp⊏dd
+ idn←(idg←(d/id⊏fi)∾≠fsc)⊔d/idv # Numbers for each identifier, per-block
# Order every referenced identifier, an extraction for each import, and an undeclaration for each declaration
ixf←(((1=ip)+⊏⟜(¯1∾b/gf))∾d⊸/⊏((≠𝕩)∾c⊏gf)˙)id⊏fi # First order by block index, open for real and closed for virtual
ig←(⍋⊏⟜(ixx←∾⟜(d⊸/)idv))⊸⊏⍋ixf # Then order by name
{"Redefinition"_err_(𝕩⊏·∾⟜(d⊸/)ID) ¬ixx∨○(»⊸≠𝕩⊸⊏)ixf} (≠d)⊸≤⊸/ig
ig↩<⟜(≠d)⊸/(⍋+`∘⊏⟜(d∾-/˜d))⊸⊏ig # Last order by declaration depth
d⊏˜↩ig⋄idv⊏˜↩ig
- ("Undefined identifier"Pl/)_err_(ig⊏ID) d<»⊸≠idv
+ ("Undefined identifier"Pl/)_err_(ig⊏ID) d<¯1⊸»⊸≠idv
idx←idg⊔(⍋d/ig)⊏d(/≥1↓PN)0<ig⊏xm # Exported identifier mask
ui←(IT d)⊸⊏⌾(ig⊸⊏)id # Index of definition (⊐ for identifiers)
- lc←(1«b)/dn←b(⊢-T)+`idm∧ac M 2‿2 # Locals Count
+ lc←(1«b)/dn←b(⊢-T)+`idm∧dd # Locals Count
idd←(id-○(⊏⟜fd)ui)∾0¨sp # Identifier frame depth
"Can't export from surrounding scope"_err_(ID) xm∧0<id≠⊸↑idd
idi←(ui⊏(fi⊏fsc)+dn-1)∾((sp⊏fi)⊏3×fx)++⟜(0⊸≤)2+sp⊏xv # Slot within frame
@@ -216,6 +216,7 @@ Parse ← {r‿vn‿i‿e←𝕨⋄nv←≠vn
dy←fa⊏«no<(tr∧r≥0)∨ro<r=0 # Dyadic
ob←pr⊏/¯1(⊢-»)u←⍷∧pr←𝕩⊏˜pi←/𝕩<sep # Objects to be loaded
cn←pi∾lt←/𝕩≥ci←vi+nv⋄ob∾↩(ci-˜≠u)+lt⊏𝕩 # Constants
+ bk←c⊏gi # Block loads
s←𝕩=sep⋄fo←𝕩=2+⊑bB⋄ls←s∧fo<○IT lo←𝕩=4+⊑bB # List Separators: after ⟨lo, not {fo
"Can't use Nothing (·) in lists"_err_(G) (»lo∨ls)∧ne
ll←sll∾˜(¬lo/1«ps)+-⟜»1↓(lo∾1)/+`ls∾0 # List Length