bdd0e96d78
A block's value is now its last statement ONLY when that statement is a trailing expression with no `;`. A trailing `;` discards the value, leaving the block void. This makes value-vs-statement explicit and lets the compiler reject "this block was supposed to produce a value". Compiler: - Parser records `Block.produces_value` (last stmt is a no-`;` trailing expression) + `Block.discarded_semi` (the `;` that discarded a value), via `expectSemicolonAfter`. A trailing expression before `}` may now omit its `;` (previously a parse error). Match-arm and else-arm bodies are built value-producing regardless of the arm `;` (arms are exempt — the `;` is an arm terminator). - Lowering: `lowerBlockValue` / the block-expr path / `inferExprType` respect `produces_value`. A value-position block that discards its value is a hard error (`lowerValueBody` for function bodies; the value-context `.block` path for if/else branches, `catch` bodies, value bindings, match arms). Pure-failable `-> !` bodies (value rides the error channel) and a value-if whose branches are void are handled without false errors. - `defer`/`onfail` cleanup bodies lower as statements (void), so a trailing `;` there is fine. Migration (behavior-preserving — output unchanged): - stdlib + ~210 examples: dropped the trailing `;` on value-position last expressions. `format` now ends with an explicit `#insert "return result;"` (it relied on `#insert`-as-block-value, which `;` discards). - Two `main :: () -> s32` examples that relied on the old silent default-return got an explicit trailing `0`. - Rejection snapshots 0412 / 1013 regenerated (their quoted source lines lost a `;`); the diagnostics themselves are unchanged. Docs/tests: specs.md "Block values" section; examples 0040 (rules) + 0041 (rejection); 3 parser unit tests. Filed issue 0066 (pre-existing match-arm negated-literal phi-width quirk, surfaced not caused here). Gates: zig build, zig build test, run_examples.sh -> 343 passed, cross_compile.sh -> 7 passed (also refreshed its stale example names).
55 lines
1.3 KiB
Plaintext
55 lines
1.3 KiB
Plaintext
// `callconv(.c)` callbacks accessing struct methods on global pointers —
|
|
// regression coverage for prior data-corruption when the callback dispatches
|
|
// through a global pointer to a method on the pointed-to struct.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
Pipe :: struct {
|
|
pw: s32;
|
|
ph: s32;
|
|
frame: s32;
|
|
|
|
resize :: (self: *Pipe, nw: s32, nh: s32) {
|
|
self.pw = nw;
|
|
self.ph = nh;
|
|
}
|
|
|
|
tick :: (self: *Pipe) {
|
|
self.frame = self.frame + 1;
|
|
}
|
|
}
|
|
|
|
g_pipe : *Pipe = ---;
|
|
g_width : s32 = 800;
|
|
g_height : s32 = 600;
|
|
|
|
do_render :: () {
|
|
g_pipe.resize(g_width, g_height);
|
|
g_pipe.tick();
|
|
print("wrapper: pw={}, ph={}, frame={}\n", g_pipe.pw, g_pipe.ph, g_pipe.frame);
|
|
}
|
|
|
|
callback_inline :: (userdata: *void, code: s64) -> bool callconv(.c) {
|
|
g_width = xx code;
|
|
g_height = xx (code + 1);
|
|
g_pipe.resize(xx g_width, xx g_height);
|
|
g_pipe.tick();
|
|
print("inline: pw={}, ph={}, frame={}\n", g_pipe.pw, g_pipe.ph, g_pipe.frame);
|
|
true
|
|
}
|
|
|
|
callback_wrapper :: (userdata: *void, code: s64) -> bool callconv(.c) {
|
|
g_width = xx code;
|
|
g_height = xx (code + 1);
|
|
do_render();
|
|
true
|
|
}
|
|
|
|
main :: () {
|
|
pipe := Pipe.{ pw = 0, ph = 0, frame = 0 };
|
|
g_pipe = @pipe;
|
|
|
|
callback_inline(xx 0, 320);
|
|
callback_wrapper(xx 0, 640);
|
|
}
|