Phase 7e: polymorphic print(x) + str(x) (retire print_int/print_str)
One `print` instead of two C-style names: `print(x)` writes an int OR a string followed by a newline, dispatching on the operand type (int -> %d, string -> %s). `print(int)` emits byte-identically to the old print_int, so every existing call and every smoke-test output is unchanged. print_str was only ever the raw IR-to-stdout dump in ir_flush (no newline), which is not "printing a line" — so it now uses file_write to a new file_stdout() stream, keeping the emitted IR byte-for-byte identical. That frees `print` to have consistent always-newline semantics. Two reseeds: (A) add print + str + file_stdout keeping the intrinsics; (B) migrate the 61 print_int calls to print, ir_flush to file_write(file_stdout()), and delete print_int/print_str (+ the now-dead @.fmt_str). str(x) (the interpolation converter from 7d) is now also a documented standalone builtin. Vocabulary: print/str/file_stdout in, print_int/print_str out (ludic_syntax.h, grammar, LudicTokens.kt). LANGUAGE.md updated. Reseeded (22551 lines); C-free fixpoint holds; goldens identical; 18/18; vocab + doc-fences clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
311042e5ab
commit
e9c15cc620
23 changed files with 2947 additions and 2924 deletions
|
|
@ -94,9 +94,10 @@ fn emit_program() -> void {
|
|||
fn ir_flush(path: ptr) -> bool {
|
||||
let h = buf_str(head)
|
||||
let c = buf_str(code)
|
||||
if (path == null) {
|
||||
print_str(h)
|
||||
print_str(c)
|
||||
if (path == null) { # raw IR to stdout (no trailing newline)
|
||||
let out = file_stdout()
|
||||
file_write(out, h, slen(h))
|
||||
file_write(out, c, slen(c))
|
||||
return true
|
||||
}
|
||||
let f = file_open(path, "wb")
|
||||
|
|
|
|||
|
|
@ -132,6 +132,12 @@ fn emit_call(e: Node) -> Val {
|
|||
g_uses_intstr = true
|
||||
return val(emit_bind(("call ptr @fn_int_str(i32 " + (a.code + ")"))), "str")
|
||||
}
|
||||
if (name == "print") { # print(x): a value + newline (int or string)
|
||||
let a = emit_expr(e.kids[0])
|
||||
if (llty(a.ty) == "ptr") { emit(" call i32 (ptr, ...) @printf(ptr @.fmt_line, ptr " + (a.code + ")\n")) }
|
||||
else { emit(" call i32 (ptr, ...) @printf(ptr @.fmt_int, i32 " + (a.code + ")\n")) }
|
||||
return val("0", "void")
|
||||
}
|
||||
if (name == "fx") { let a = emit_expr(e.kids[0]); return val(emit_bind(("shl i32 " + (a.code + ", 16"))), "fixed") }
|
||||
if (name == "flr") { let a = emit_expr(e.kids[0]); return val(emit_bind(("ashr i32 " + (a.code + ", 16"))), "int") }
|
||||
if is_intrinsic(name) { return emit_intrinsic(name, e) }
|
||||
|
|
|
|||
|
|
@ -69,8 +69,9 @@ fn emit_header() -> void {
|
|||
emith("declare i32 @win_running()\n")
|
||||
emith("declare void @win_close()\n")
|
||||
emith("@__stderrp = external global ptr\n")
|
||||
emith("@.fmt_str = private unnamed_addr constant [3 x i8] c\"%s\\00\"\n")
|
||||
emith("@__stdoutp = external global ptr\n")
|
||||
emith("@.fmt_int = private unnamed_addr constant [4 x i8] c\"%d\\0A\\00\"\n")
|
||||
emith("@.fmt_line = private unnamed_addr constant [4 x i8] c\"%s\\0A\\00\"\n")
|
||||
emith("@L_argc = internal global i32 0\n")
|
||||
emith("@L_argv = internal global ptr null\n")
|
||||
emith("@.gametitle = private unnamed_addr constant [")
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ fn is_intrinsic(name: ptr) -> bool {
|
|||
if (name == "peek8") or (name == "poke8") { return true }
|
||||
if (name == "file_open") or (name == "file_read") or (name == "file_write") { return true }
|
||||
if (name == "file_seek") or (name == "file_tell") or (name == "file_close") { return true }
|
||||
if (name == "print_str") or (name == "print_int") { return true }
|
||||
if (name == "os_argc") or (name == "os_arg") or (name == "os_exit") or (name == "file_stderr") { return true }
|
||||
if (name == "file_stdout") { return true }
|
||||
if (name == "os_system") or (name == "os_getenv") { return true }
|
||||
if (name == "peek32") or (name == "poke32") { return true }
|
||||
return false
|
||||
|
|
@ -75,16 +75,7 @@ fn emit_intrinsic(name: ptr, e: Node) -> Val {
|
|||
emit(" call i32 @fclose(ptr "); emit(f); emit(")\n")
|
||||
return val("0", "void")
|
||||
}
|
||||
if (name == "print_str") {
|
||||
let s = arg_code(e, 0)
|
||||
emit(" call i32 (ptr, ...) @printf(ptr @.fmt_str, ptr "); emit(s); emit(")\n")
|
||||
return val("0", "void")
|
||||
}
|
||||
if (name == "print_int") {
|
||||
let n = arg_code(e, 0)
|
||||
emit(" call i32 (ptr, ...) @printf(ptr @.fmt_int, i32 "); emit(n); emit(")\n")
|
||||
return val("0", "void")
|
||||
}
|
||||
# print_str / print_int are the polymorphic `print(x)` builtin now (emit_call).
|
||||
if (name == "os_argc") { return val(emit_bind("load i32, ptr @L_argc"), "int") }
|
||||
if (name == "os_arg") {
|
||||
let i = arg_code(e, 0)
|
||||
|
|
@ -100,6 +91,7 @@ fn emit_intrinsic(name: ptr, e: Node) -> Val {
|
|||
return val("0", "void")
|
||||
}
|
||||
if (name == "file_stderr") { return val(emit_bind("load ptr, ptr @__stderrp"), "ptr") }
|
||||
if (name == "file_stdout") { return val(emit_bind("load ptr, ptr @__stdoutp"), "ptr") }
|
||||
if (name == "os_system") {
|
||||
let c = arg_code(e, 0)
|
||||
return val(emit_bind(("call i32 @system(ptr " + (c + ")"))), "int")
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,13 +1,13 @@
|
|||
program T {
|
||||
fn fib(n: int) -> int { if n < 2 { return n }; return fib(n-1) + fib(n-2) }
|
||||
entry {
|
||||
print_int(fib(10)) # 55
|
||||
print(fib(10)) # 55
|
||||
var s = 0
|
||||
for i in 0 .. 10 { if i == 5 { break }; if i % 2 == 0 { continue }; s = s + i }
|
||||
print_int(s) # 1+3 = 4
|
||||
print(s) # 1+3 = 4
|
||||
var i = 0; var t = 0
|
||||
while true { i = i + 1; if i > 5 { break }; t = t + i }
|
||||
print_int(t) # 15
|
||||
if false and (1/0 == 0) { print_int(999) } else { print_int(1) } # short-circuit: no div by zero
|
||||
print(t) # 15
|
||||
if false and (1/0 == 0) { print(999) } else { print(1) } # short-circuit: no div by zero
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ program T {
|
|||
entry {
|
||||
let half = 0.5
|
||||
let a = 1.5
|
||||
print_int(flr(a + half)) # flr(2.0) = 2
|
||||
print_int(flr(a * 2.0)) # flr(3.0) = 3
|
||||
print(flr(a + half)) # flr(2.0) = 2
|
||||
print(flr(a * 2.0)) # flr(3.0) = 3
|
||||
let third = 1.0 / 3.0
|
||||
print_int(flr(third * 3.0)) # ~flr(1.0) = 1 (may be 0 with rounding)
|
||||
print_int(flr(fx(5) + a)) # flr(6.5) = 6
|
||||
if a > half { print_int(1) } else { print_int(0) } # 1
|
||||
print(flr(third * 3.0)) # ~flr(1.0) = 1 (may be 0 with rounding)
|
||||
print(flr(fx(5) + a)) # flr(6.5) = 6
|
||||
if a > half { print(1) } else { print(0) } # 1
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ program T {
|
|||
return 0
|
||||
}
|
||||
entry {
|
||||
print_int(classify(65)) # 1
|
||||
print_int(classify(67)) # 2
|
||||
print_int(classify(90)) # 9
|
||||
print_int((1 << 4)) # 16
|
||||
print_int(((4 | 1) & 6)) # 4
|
||||
print(classify(65)) # 1
|
||||
print(classify(67)) # 2
|
||||
print(classify(90)) # 9
|
||||
print((1 << 4)) # 16
|
||||
print(((4 | 1) & 6)) # 4
|
||||
let p = mem_alloc(16)
|
||||
poke32(p, 1, 9999)
|
||||
print_int(peek32(p, 1)) # 9999
|
||||
print(peek32(p, 1)) # 9999
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
program T {
|
||||
entry {
|
||||
let xs = new []int
|
||||
print_int(len(xs)) # 0
|
||||
print(len(xs)) # 0
|
||||
for i in 0 .. 20 { push(xs, i * i) }
|
||||
print_int(len(xs)) # 20
|
||||
print_int(xs[19]) # 361
|
||||
print(len(xs)) # 20
|
||||
print(xs[19]) # 361
|
||||
xs[3] = 777
|
||||
print_int(xs[3]) # 777
|
||||
print(xs[3]) # 777
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,18 @@ program T {
|
|||
fn bump(p: P) -> void { p.x = p.x + 100 }
|
||||
entry {
|
||||
let a = new P
|
||||
print_int(a.y) # 7 default
|
||||
print(a.y) # 7 default
|
||||
a.x = 5
|
||||
let b = a
|
||||
b.x = 9
|
||||
print_int(a.x) # 9 (reference)
|
||||
print(a.x) # 9 (reference)
|
||||
bump(a)
|
||||
print_int(a.x) # 109
|
||||
print(a.x) # 109
|
||||
let c = new P
|
||||
c.x = 2
|
||||
a.next = c
|
||||
print_int(a.next.x) # 2 chained
|
||||
print(a.next.x) # 2 chained
|
||||
a.next.x = 42
|
||||
print_int(c.x) # 42
|
||||
print(c.x) # 42
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue