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).
50 lines
1.7 KiB
Plaintext
50 lines
1.7 KiB
Plaintext
// Regression: `obj.method()` foreign-class dispatch with a `float`
|
|
// return type used to silently emit `LLVMGetUndef` because the
|
|
// `Call<T>Method` switch in `emit_llvm.zig` didn't cover `.f32`.
|
|
// Combined with multiple such calls inlined as args to a single
|
|
// outer call (`f(o.a(), o.b(), o.c())`), every arg after the first
|
|
// went out as `undef` — exactly the chess Android touch failure
|
|
// (`MotionEvent.getX()` + `getY()` came through as `undef`s into
|
|
// `sx_android_push_touch`).
|
|
//
|
|
// This test exercises BOTH the `.f32` jdispatch slot AND the
|
|
// "multiple foreign-class method calls as args to one outer call"
|
|
// pattern. The bodies are gated behind a runtime-false flag so the
|
|
// JNI lookups never execute (no JVM in the test runtime), but the
|
|
// codegen path still has to emit the calls correctly.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
MotionEvent :: #foreign #jni_class("android/view/MotionEvent") {
|
|
getAction :: (self: *Self) -> s32;
|
|
getX :: (self: *Self) -> f32;
|
|
getY :: (self: *Self) -> f32;
|
|
}
|
|
|
|
sx_consume_touch :: (action: s32, x: f32, y: f32) {
|
|
// Black-hole call so the args aren't dead-stripped before LLVM
|
|
// verification gets a chance to look at the call site.
|
|
if action == 0 and x == 0.0 and y == 0.0 {
|
|
print("zero\n");
|
|
}
|
|
}
|
|
|
|
g_should_call : bool = false;
|
|
|
|
drive_touch :: (env: *void, ev: *MotionEvent) {
|
|
#jni_env(env) {
|
|
// The bug: getX() / getY() lowered to `undef` floats and the
|
|
// call to sx_consume_touch passed garbage. Post-fix, all three
|
|
// JNI calls emit proper Call<T>Method dispatches.
|
|
sx_consume_touch(ev.getAction(), ev.getX(), ev.getY());
|
|
}
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
if g_should_call {
|
|
drive_touch(null, null);
|
|
}
|
|
print("ok\n");
|
|
0
|
|
}
|