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).
31 lines
961 B
Plaintext
31 lines
961 B
Plaintext
// Phase 2 step 2.16b (PLAN-FFI.md): xfail then green for the
|
|
// lexical-direct env resolution inside a `#jni_env` scope.
|
|
//
|
|
// `#jni_call(T)(target, "name", "sig", args...)` — three args before
|
|
// the first string literal — has the env omitted. The lowering walks
|
|
// the in-progress AST visit stack to find the enclosing `#jni_env(env)`
|
|
// block and uses that env value directly as the IR-level env arg.
|
|
// No thread-local read, no per-call lookup; env stays register-
|
|
// resident across loop bodies (the hot-path optimisation).
|
|
//
|
|
// Today's lower expects 4+ args and errors when called with 3.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
g_should_call : bool = false;
|
|
|
|
unused_jni :: (env: *void, target: *void) {
|
|
#jni_env(env) {
|
|
// Omitted env — env comes from the enclosing #jni_env scope.
|
|
#jni_call(void)(target, "noop", "()V");
|
|
}
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
if g_should_call {
|
|
unused_jni(null, null);
|
|
}
|
|
print("ok\n");
|
|
0
|
|
}
|