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).
39 lines
1.3 KiB
Plaintext
39 lines
1.3 KiB
Plaintext
// Closure free-variable capture works through `FfiIntrinsicCall`
|
|
// nodes — names referenced inside `#objc_call` / `#jni_call` /
|
|
// `#jni_static_call` argument lists from inside a closure body are
|
|
// recognized as captured variables and bound from the closure's env
|
|
// struct at call time. `passthrough_works` is the baseline (normal
|
|
// expression capture); `passthrough_via_objc_call` exercises the same
|
|
// capture through an FFI intrinsic call's arg list.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
#import "modules/std/objc.sx";
|
|
|
|
passthrough_works :: (recv: *void) -> Closure(s32) -> *void {
|
|
closure((d: s32) -> *void => recv) // captures `recv` — fine
|
|
}
|
|
|
|
passthrough_via_objc_call :: (recv: *void) -> Closure(s32) -> s64 {
|
|
// Same `recv` capture, but inside `#objc_call(...)`'s arg list.
|
|
closure((d: s32) -> s64 => #objc_call(s64)(recv, "hash"))
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
inline if OS == .macos {
|
|
f := passthrough_works(null);
|
|
p := f(0);
|
|
print("ok (passthrough works) = {}\n", p == null);
|
|
|
|
// Capture inside the `#objc_call` arg list.
|
|
ns_object := objc_getClass("NSObject".ptr);
|
|
g := passthrough_via_objc_call(ns_object);
|
|
h := g(0);
|
|
print("ok (passthrough via #objc_call) = {}\n", h != 0);
|
|
}
|
|
inline if OS != .macos {
|
|
print("skipped (not macos)\n");
|
|
}
|
|
0
|
|
}
|