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).
32 lines
1.4 KiB
Plaintext
32 lines
1.4 KiB
Plaintext
// `#jni_main` pipeline slice 2 (PLAN-FFI.md): the compiler renders a
|
|
// `.java` source for a `#jni_main #jni_class("...")` declaration, runs
|
|
// `javac` + `d8`, and bundles `classes.dex` into the APK.
|
|
//
|
|
// Slice 2 only wires the plumbing — the manifest still points at
|
|
// `android.app.NativeActivity`, so the user's class isn't loaded at
|
|
// runtime. Slice 3 (manifest synthesis) and slice 4 (RegisterNatives)
|
|
// land in follow-up commits.
|
|
//
|
|
// Build to inspect APK contents (requires Android SDK + JDK):
|
|
// /Users/agra/projects/sx/zig-out/bin/sx build --target android \
|
|
// --apk /tmp/sxjnimain.apk --bundle-id co.swipelab.sxjnimain \
|
|
// -o /tmp/libsxjnimain.so examples/ffi-jni-main-01-emit.sx
|
|
// unzip -l /tmp/sxjnimain.apk | grep classes.dex
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
|
|
// `*Bundle` resolves through the class registry to `android.os.Bundle`
|
|
// in the emitted Java — needed for `onCreate`'s @Override to match
|
|
// NativeActivity's superclass signature.
|
|
Bundle :: #foreign #jni_class("android/os/Bundle") { }
|
|
|
|
// `#jni_main` flags this as the launchable Android Activity class. The
|
|
// `onCreate` body is empty for now — slice 4 wires `RegisterNatives`
|
|
// so the `sx_onCreate` native delegate actually binds to a sx-side fn.
|
|
SxApp :: #jni_main #jni_class("co/swipelab/sxjnimain/SxApp") {
|
|
onCreate :: (self: *Self, b: *Bundle) { }
|
|
}
|
|
|
|
main :: () -> s32 { 0 }
|