workshopsoft/ludic
2
0
Fork 0
Code Issues Pull requests Projects Releases 26 Packages Wiki Activity Actions

Phase 7g: the compiler builds its IR with interpolation, not +

Browse source 
Answering your readability point directly: the compiler's own string-building —
left uglier by the 7c `+` migration, e.g. `emit_bind(("load i32, ptr " + ip))` —
now reads as interpolation:

  emit_bind(("load i32, ptr " + ip))            -> emit_bind(`load i32, ptr {ip}`)
  emit_bind(("icmp eq i32 " + (kv + (", " + itoa(ak)))))
                                                -> emit_bind(`icmp eq i32 {kv}, {itoa(ak)}`)
  perr(("assign to unknown " + t.s))            -> perr(`assign to unknown {t.s}`)

164 concat chains across selfhost converted by a tool that flattens the `+` tree,
keeps call/index parens (only grouping parens are rewritten), and converts only
**brace-free** literals — LLVM IR structure strings full of `{`/`}` stay as `+`
rather than becoming awkward `{{`/`}}`. No new language surface; interpolation
already desugars to the same concat.

Reseeded (22565 lines); C-free fixpoint holds byte-for-byte (the strongest proof
the reconstruction is exact); goldens identical; 18/18.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Orkun ÇAKILKAYA 2026-08-28 01:30:37 +03:00
parent 4faf91abdc
commit df6955e609
20 changed files with 566 additions and 566 deletions
Download patch file Download diff file Expand all files Collapse all files

26
selfhost/emit_stmt.ludic
View file

@ -25,13 +25,13 @@ fn emit_assign(st: Node) -> void {
if li >= 0 {
# a `let` binding is immutable: rebinding it is an error (mutating THROUGH
# it — `x.field = …`, `x[i] = …` — is fine, and lands in the branches below).
if loc_mut[li] == 0 { perr(("cannot assign to immutable '" + (t.s + ("' (declared with let; use var) — line " + itoa(st.line))))) }
if loc_mut[li] == 0 { perr(`cannot assign to immutable '{t.s}' (declared with let; use var) — line {itoa(st.line)}`) }
addr = loc_reg[li]; ty = loc_ty[li]
}
else {
let g = find_global(t.s)
if (g == null) { perr(("assign to unknown " + t.s)) }
addr = ("@g_" + t.s); ty = g.ty
if (g == null) { perr(`assign to unknown {t.s}`) }
addr = `@g_{t.s}`; ty = g.ty
}
} else {
if t.kind == E_MEMBER { addr = emit_member_addr(t); ty = g_addr_ty }
@ -42,19 +42,19 @@ fn emit_assign(st: Node) -> void {
let rv = emit_expr(st.b)
var v = rv.code
if not (st.s == "=") {
let cur = emit_bind(("load " + (lt + (", ptr " + addr))))
let cur = emit_bind(`load {lt}, ptr {addr}`)
var opc = "add"
if (st.s == ("-=")) { opc = "sub" }
if (st.s == ("*=")) { opc = "mul" }
if (st.s == ("/=")) { opc = "sdiv" }
v = emit_bind((opc + (" i32 " + (cur + (", " + v)))))
v = emit_bind(`{opc} i32 {cur}, {v}`)
}
store_at(lt, v, addr)
}
fn emit_if(st: Node) -> void {
let c = emit_expr(st.a)
let cc = emit_bind(("icmp ne i32 " + (c.code + ", 0")))
let cc = emit_bind(`icmp ne i32 {c.code}, 0`)
let has_else = (st.c != null)
let tl = lbl("then"); let el = lbl("else"); let en = lbl("ifend")
if has_else { emit(" br i1 "); emit(cc); emit(", label %"); emit(tl); emit(", label %"); emit(el); emit("\n") }
@ -76,7 +76,7 @@ fn emit_while(st: Node) -> void {
emit(" br label %"); emit(cl); emit("\n")
emit(cl); emit(":\n")
let c = emit_expr(st.a)
let cc = emit_bind(("icmp ne i32 " + (c.code + ", 0")))
let cc = emit_bind(`icmp ne i32 {c.code}, 0`)
emit(" br i1 "); emit(cc); emit(", label %"); emit(bl); emit(", label %"); emit(en); emit("\n")
emit(bl); emit(":\n"); g_term = false
loop_push(cl, en)
@ -94,9 +94,9 @@ fn emit_for(st: Node) -> void {
let cl = lbl("fcond"); let bl = lbl("fbody"); let ct = lbl("fcont"); let en = lbl("fend")
emit(" br label %"); emit(cl); emit("\n")
emit(cl); emit(":\n")
let iv = emit_bind(("load i32, ptr " + slot))
let iv = emit_bind(`load i32, ptr {slot}`)
let hi = emit_expr(st.b)
let cc = emit_bind(("icmp slt i32 " + (iv + (", " + hi.code))))
let cc = emit_bind(`icmp slt i32 {iv}, {hi.code}`)
emit(" br i1 "); emit(cc); emit(", label %"); emit(bl); emit(", label %"); emit(en); emit("\n")
emit(bl); emit(":\n"); g_term = false
loop_push(ct, en)
@ -104,8 +104,8 @@ fn emit_for(st: Node) -> void {
loop_pop()
if not g_term { emit(" br label %"); emit(ct); emit("\n") }
emit(ct); emit(":\n")
let i2 = emit_bind(("load i32, ptr " + slot))
let i3 = emit_bind(("add i32 " + (i2 + ", 1")))
let i2 = emit_bind(`load i32, ptr {slot}`)
let i3 = emit_bind(`add i32 {i2}, 1`)
store_at("i32", i3, slot)
emit(" br label %"); emit(cl); emit("\n")
emit(en); emit(":\n"); g_term = false
@ -140,9 +140,9 @@ fn emit_match(st: Node) -> void {
var p = 0
while p < len(arm.kids) {
let pv = emit_expr(arm.kids[p])
let c = emit_bind(("icmp eq i32 " + (sv.code + (", " + pv.code))))
let c = emit_bind(`icmp eq i32 {sv.code}, {pv.code}`)
if first { acc = c; first = false }
else { acc = emit_bind(("or i1 " + (acc + (", " + c)))) }
else { acc = emit_bind(`or i1 {acc}, {c}`) }
p = p + 1
}
let bodyl = lbl("mbody"); let nextl = lbl("marm")