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).
40 lines
1.5 KiB
Plaintext
40 lines
1.5 KiB
Plaintext
// Phase 1 step 1.14 (PLAN-FFI.md): `#objc_call` inside an
|
|
// `inline if OS == .ios { ... }` arm cross-compiles cleanly to
|
|
// Android. The comptime gate must strip the arm BEFORE the
|
|
// `objc_msg_send` lowering runs, otherwise emit_llvm would
|
|
// produce calls to `@objc_msgSend` / `@sel_registerName` that
|
|
// don't exist in Bionic + libGLESv3 / linker would fail.
|
|
//
|
|
// On macOS the iOS arm is also stripped (we're not iOS) so the
|
|
// runtime test just prints "host stripped both", proving the
|
|
// `inline if OS == { case }` form works around `#objc_call`
|
|
// sites the same way it does elsewhere.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
|
|
// Empty stub class — Android cross-compile requires a `#jni_main`
|
|
// declaration to satisfy the entry-point check. This file is testing
|
|
// `inline if OS` gating around `#objc_call`, not Activity wiring.
|
|
SxObjcOsGateStub :: #jni_main #jni_class("co/swipelab/sxobjcosgate/SxObjcOsGateStub") { }
|
|
|
|
main :: () -> s32 {
|
|
inline if OS == {
|
|
case .ios: {
|
|
// Stripped on macOS + Android. Compiled on iOS / ios-sim.
|
|
#objc_call(void)(null, "init");
|
|
print("ios path\n");
|
|
}
|
|
case .android: {
|
|
// Stripped on macOS + iOS. Compiled on Android.
|
|
// Nothing #objc_call-shaped here — just text — so we
|
|
// exercise the gate symmetrically across targets.
|
|
print("android path\n");
|
|
}
|
|
else: {
|
|
print("host stripped both\n");
|
|
}
|
|
}
|
|
0
|
|
}
|