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).
46 lines
1.8 KiB
Plaintext
46 lines
1.8 KiB
Plaintext
// Phase 1 step 1.15 (PLAN-FFI.md): `#jni_call(void)` codegen.
|
|
//
|
|
// `#jni_call(T)(env, target, "method_name", "(Sig)RetSig", args...)`
|
|
// dispatches a JNI instance-method call. The lowering hand-emits the
|
|
// vtable indirection:
|
|
//
|
|
// ifs = *env // JNINativeInterface*
|
|
// cls = ifs->GetObjectClass(env, target)
|
|
// mid = ifs->GetMethodID(env, cls, name, sig)
|
|
// ifs->Call<Type>Method(env, target, mid, args...)
|
|
//
|
|
// Phase 1.17 introduces method-ID caching via static slots populated
|
|
// at module-init; this step keeps the per-call-site lookup.
|
|
//
|
|
// Host can't dlopen libjvm via the JIT, so the JNI body is gated
|
|
// behind `inline if OS == .android`. The macOS test path strips the
|
|
// body and prints "skipped"; the cross_compile.sh Android target
|
|
// verifies that the gated body actually compiles + links against
|
|
// libjvm in the Android sysroot.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
|
|
// Android target requires a `#jni_main` Activity declaration to
|
|
// satisfy the entry-point check. An empty stub class is enough — this
|
|
// file is testing `#jni_call` lowering, not Activity wiring.
|
|
SxJniCallVoidStub :: #jni_main #jni_class("co/swipelab/sxjnicall/SxJniCallVoidStub") { }
|
|
|
|
main :: () -> s32 {
|
|
inline if OS == .android {
|
|
// Real Android entry passes env + target via the user's `onCreate`
|
|
// / `#jni_attach`. For the cross-compile-only test we just need
|
|
// the lowering to emit valid IR; runtime correctness is exercised
|
|
// by the chess sx_android_query_safe_insets path.
|
|
env : *void = null;
|
|
target : *void = null;
|
|
#jni_env(env) {
|
|
#jni_call(void)(target, "noop", "()V");
|
|
}
|
|
}
|
|
inline if OS != .android {
|
|
print("skipped (not android)\n");
|
|
}
|
|
0
|
|
}
|