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:
@@ -9,7 +9,7 @@
|
||||
SmokeErr :: error { Empty, BadDigit, Overflow }
|
||||
|
||||
// value-carrying, named set
|
||||
sm_parse :: (n: s32) -> (s32, !SmokeErr) {
|
||||
sm_parse :: (n: i32) -> (i32, !SmokeErr) {
|
||||
if n < 0 { raise error.BadDigit; }
|
||||
if n == 0 { raise error.Empty; }
|
||||
if n > 99 { raise error.Overflow; }
|
||||
@@ -23,14 +23,14 @@ sm_check :: (ok: bool) -> ! {
|
||||
}
|
||||
|
||||
// multi-value, inferred set: `try` propagates; SCC absorbs SmokeErr
|
||||
sm_pair :: (a: s32, b: s32) -> (s32, s32, !) {
|
||||
sm_pair :: (a: i32, b: i32) -> (i32, i32, !) {
|
||||
x := try sm_parse(a);
|
||||
y := try sm_parse(b);
|
||||
return (x, y);
|
||||
}
|
||||
|
||||
// catch with a diverging block body
|
||||
sm_or_default :: (n: s32) -> s32 {
|
||||
sm_or_default :: (n: i32) -> i32 {
|
||||
return sm_parse(n) catch (e) {
|
||||
print(" logged {}\n", e);
|
||||
return -1;
|
||||
@@ -38,7 +38,7 @@ sm_or_default :: (n: s32) -> s32 {
|
||||
}
|
||||
|
||||
// onfail + defer interleave: cleanup runs only on the error path
|
||||
sm_acquire :: (fail: bool) -> (s32, !) {
|
||||
sm_acquire :: (fail: bool) -> (i32, !) {
|
||||
defer print(" defer A\n");
|
||||
onfail print(" onfail B\n");
|
||||
if fail { raise error.Acquire; }
|
||||
@@ -46,7 +46,7 @@ sm_acquire :: (fail: bool) -> (s32, !) {
|
||||
}
|
||||
|
||||
// or-chain: try a, fall to try b; propagate if both fail
|
||||
sm_first :: (a: s32, b: s32) -> (s32, !) {
|
||||
sm_first :: (a: i32, b: i32) -> (i32, !) {
|
||||
v := try sm_parse(a) or try sm_parse(b);
|
||||
return v;
|
||||
}
|
||||
@@ -54,13 +54,13 @@ sm_first :: (a: s32, b: s32) -> (s32, !) {
|
||||
// --- Composition (ERR E5.1): failable closures, widening, generics ---
|
||||
|
||||
// Closure(...) param, try-propagated (the env is carried)
|
||||
sm_run :: (cb: Closure(s32) -> (s32, !SmokeErr), n: s32) -> (s32, !SmokeErr) {
|
||||
sm_run :: (cb: Closure(i32) -> (i32, !SmokeErr), n: i32) -> (i32, !SmokeErr) {
|
||||
return try cb(n);
|
||||
}
|
||||
|
||||
// bare fn-type param: a NON-failable closure literal widens into the failable
|
||||
// slot (the ∅-widening adapter wraps `{value, 0}`)
|
||||
sm_widen :: (cb: (s32) -> (s32, !SmokeErr), n: s32) -> s32 {
|
||||
sm_widen :: (cb: (i32) -> (i32, !SmokeErr), n: i32) -> i32 {
|
||||
return cb(n) catch (e) -1;
|
||||
}
|
||||
|
||||
@@ -120,15 +120,15 @@ main :: () {
|
||||
iv, ierr := sm_acquire(false);
|
||||
|
||||
// composition: inline failable closure literal through a Closure(...) param
|
||||
cl := sm_run(closure((x: s32) -> (s32, !SmokeErr) { if x < 0 { raise error.BadDigit; } return x * 2; }), 6) catch (e) -1;
|
||||
cl := sm_run(closure((x: i32) -> (i32, !SmokeErr) { if x < 0 { raise error.BadDigit; } return x * 2; }), 6) catch (e) -1;
|
||||
print("closure-run: {}\n", cl); // 12
|
||||
print("closure-run-err: {}\n", sm_run(closure((x: s32) -> (s32, !SmokeErr) { raise error.Empty; }), 1) catch (e) -9); // -9
|
||||
print("closure-run-err: {}\n", sm_run(closure((x: i32) -> (i32, !SmokeErr) { raise error.Empty; }), 1) catch (e) -9); // -9
|
||||
|
||||
// non-failable closure literal widened into the failable bare slot
|
||||
print("widen: {}\n", sm_widen(closure((x: s32) -> s32 => x + 1), 9)); // 10
|
||||
print("widen: {}\n", sm_widen(closure((x: i32) -> i32 => x + 1), 9)); // 10
|
||||
|
||||
// generic failable composition (monomorphized at s32)
|
||||
print("wrap: {}\n", sm_wrap(s32, closure(() -> (s32, !SmokeErr) { return 42; })) catch (e) 0); // 42
|
||||
// generic failable composition (monomorphized at i32)
|
||||
print("wrap: {}\n", sm_wrap(i32, closure(() -> (i32, !SmokeErr) { return 42; })) catch (e) 0); // 42
|
||||
|
||||
print("errors ok\n");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user