lang: rename signed integer types sN -> iN
Surface rename of the signed integer family: s1..s64 become i1..i64
(u1..u64, usize, isize unchanged). 'string' keeps the s-prefix arm in
name classification; width parsing moves to the i-prefix arm next to
isize.
Internal TypeId tags follow the surface (.s8/.s16/.s32/.s64 ->
.i8/.i16/.i32/.i64), as do mono-key mangle fragments (ptr_i64,
tu_i64_bool) and all display/diagnostic formatting (i{d}).
Migrated in the same sweep: stdlib + examples + issue repros + FFI C
companions (shared symbol names like ffi_id_i64), expected
stdout/stderr/ir snapshots, specs.md, readme.md, CLAUDE.md/AGENTS.md,
implementation_plan.md, docs/, issue writeups. Vendored stb_image and
historical flow state left untouched.
zig build test: 426/426; examples suite: 595/595.
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
// library/modules/platform/android.sx.
|
||||
//
|
||||
// Two arities covered:
|
||||
// 1. (s32) -> s32 — single-arg callback
|
||||
// 2. (*void, s32) -> s32 — pointer + value (onInputEvent shape)
|
||||
// 1. (i32) -> i32 — single-arg callback
|
||||
// 2. (*void, i32) -> i32 — pointer + value (onInputEvent shape)
|
||||
//
|
||||
// Plus a side-effect via a global so we can confirm the callback
|
||||
// actually fired (return value + state mutation both observable).
|
||||
@@ -16,27 +16,27 @@
|
||||
#source "1214-ffi-06-callback.c";
|
||||
};
|
||||
|
||||
ffi_apply_callback :: (cb: (s32) -> s32 callconv(.c), value: s32) -> s32 #foreign;
|
||||
ffi_apply_callback2 :: (cb: (*void, s32) -> s32 callconv(.c), ctx: *void, v: s32) -> s32 #foreign;
|
||||
ffi_apply_callback :: (cb: (i32) -> i32 callconv(.c), value: i32) -> i32 #foreign;
|
||||
ffi_apply_callback2 :: (cb: (*void, i32) -> i32 callconv(.c), ctx: *void, v: i32) -> i32 #foreign;
|
||||
|
||||
g_callback_hits : s32 = 0;
|
||||
g_callback_sum : s32 = 0;
|
||||
g_callback_hits : i32 = 0;
|
||||
g_callback_sum : i32 = 0;
|
||||
|
||||
double_it :: (x: s32) -> s32 callconv(.c) {
|
||||
double_it :: (x: i32) -> i32 callconv(.c) {
|
||||
g_callback_hits += 1;
|
||||
g_callback_sum += x;
|
||||
x * 2
|
||||
}
|
||||
|
||||
add_with_ctx :: (ctx: *void, v: s32) -> s32 callconv(.c) {
|
||||
add_with_ctx :: (ctx: *void, v: i32) -> i32 callconv(.c) {
|
||||
g_callback_hits += 1;
|
||||
// Pass a sentinel via ctx to prove the pointer arg also survives the
|
||||
// round-trip — read it back as an s32 through *s32.
|
||||
p : *s32 = xx ctx;
|
||||
// round-trip — read it back as an i32 through *i32.
|
||||
p : *i32 = xx ctx;
|
||||
p.* + v
|
||||
}
|
||||
|
||||
main :: () -> s32 {
|
||||
main :: () -> i32 {
|
||||
// ── Single-arg callback ────────────────────────────────────────
|
||||
r1 := ffi_apply_callback(double_it, 21);
|
||||
print("callback returned = {}\n", r1);
|
||||
@@ -50,7 +50,7 @@ main :: () -> s32 {
|
||||
print("sum after three calls = {}\n", g_callback_sum);
|
||||
|
||||
// ── Two-arg callback with opaque ctx pointer ───────────────────
|
||||
ctx_val : s32 = 100;
|
||||
ctx_val : i32 = 100;
|
||||
r2 := ffi_apply_callback2(add_with_ctx, xx @ctx_val, 42);
|
||||
print("ctx + value = {}\n", r2);
|
||||
print("hits after ctx callback = {}\n", g_callback_hits);
|
||||
|
||||
Reference in New Issue
Block a user