Phase 3d: declaration modifiers become @annotations (Rule A)
edge/pure/export prefix keywords retired; modifiers are now leading @annotations (@export, @edge, @pure, @deterministic). parse_one_decl collects a leading @anno run and @export sets the fn export flag; dead edge-dispatch removed from parse_system. Migrated examples/lib/combat.ludic; old prefixes now rejected. Behavior-identical: the export flag is parse-only in the self-hosted emitter (emits @fn_<name> for every fn, never reads the flag), so IR is byte-identical. Reseeded, fixpoint holds, test.sh 14/14. Docs updated. Phase 3 complete. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
b643037d8f
commit
9a558d6b58
9 changed files with 782 additions and 765 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -272,8 +272,18 @@ fn already_loaded(full: ptr) -> bool {
|
|||
return false
|
||||
}
|
||||
|
||||
# parse one top-level declaration (or resolve an import) into `prog`
|
||||
# parse one top-level declaration (or resolve an import) into `prog`.
|
||||
# Modifiers are `@annotations` in front of the declaration: `@export`, `@edge`,
|
||||
# `@pure`, `@deterministic`, … — one channel, not a zoo of prefix keywords.
|
||||
fn parse_one_decl() -> void {
|
||||
let is_export = false
|
||||
while is_op("@") {
|
||||
pi = pi + 1; let a = eat_id() # collect a leading @annotation
|
||||
if streq(a, "export") { is_export = true }
|
||||
if is_op("(") { let d = 0 # optional @anno(args) — skipped
|
||||
while true { if is_op("(") { d = d + 1 }; if is_op(")") { d = d - 1 }; pi = pi + 1; if d == 0 { break } } }
|
||||
skipnl()
|
||||
}
|
||||
if is_id("import") { pi = pi + 1
|
||||
let t = toks[pi]
|
||||
if t.kind != TK_STR { perr("expected \"path\" after import") }
|
||||
|
|
@ -284,12 +294,11 @@ fn parse_one_decl() -> void {
|
|||
if is_id("struct") { push(prog, parse_struct()); return }
|
||||
if is_id("component") { push(prog, parse_component()); return }
|
||||
if is_id("archetype") { push(prog, parse_archetype()); return }
|
||||
if is_id("system") or is_id("edge") { push(prog, parse_system()); return }
|
||||
if is_id("system") { push(prog, parse_system()); return }
|
||||
if is_id("ui") { push(prog, parse_ui()); return }
|
||||
if is_id("var") { push(prog, parse_var()); return }
|
||||
if is_id("const") { push(prog, parse_const()); return }
|
||||
if is_id("export") { pi = pi + 1; let f = parse_fn(); f.ival = 1; push(prog, f); return }
|
||||
if is_id("fn") or is_id("pure") { if is_id("pure") { pi = pi + 1 }; push(prog, parse_fn()); return }
|
||||
if is_id("fn") { let f = parse_fn(); if is_export { f.ival = 1 }; push(prog, f); return }
|
||||
if is_id("extern") { push(prog, parse_extern()); return }
|
||||
if is_id("main") { push(prog, parse_main()); return }
|
||||
perr("expected declaration")
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ fn skip_clause() -> void {
|
|||
}
|
||||
|
||||
fn parse_system() -> Node {
|
||||
if is_id("edge") { pi = pi + 1 } # optional `edge` modifier before `system`
|
||||
pi = pi + 1; let n = node(N_SYS); n.s = eat_id(); n.ty = "Update"
|
||||
# clauses: @anno, phase X, reads/writes/needs/uses [..], query (..) [..]
|
||||
# A `query (vars) [terms] where c` clause desugars to a body wrapped in one
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue