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).
62 lines
2.3 KiB
Plaintext
62 lines
2.3 KiB
Plaintext
// Backfill for Phase 1D cluster 1.32 (PLAN-FFI.md): `#objc_call(CGRect)`
|
||
// and `#objc_call(u64)` against `class_addMethod`-registered IMPs.
|
||
// Both shapes were already exercised transitively in earlier work —
|
||
// CGRect is structurally a 4×f64 HFA (same as UIEdgeInsets from
|
||
// ffi-objc-call-07), and u64 is i64 at the LLVM level (same as the
|
||
// s64 return from ffi-objc-call-04's `hash`). The cluster-1.32
|
||
// migration of `uikit_keyboard_will_change_frame` was the first
|
||
// place we used both shapes through `#objc_call` directly, but the
|
||
// keyboard-change-frame callback isn't reached by the chess launch
|
||
// path, so this test gives the two shapes their own runtime lockdown.
|
||
|
||
#import "modules/std.sx";
|
||
#import "modules/compiler.sx";
|
||
#import "modules/std/objc.sx";
|
||
|
||
CGRect :: struct {
|
||
x: f64;
|
||
y: f64;
|
||
width: f64;
|
||
height: f64;
|
||
}
|
||
|
||
rect_imp :: (self: *void, _cmd: *void) -> CGRect callconv(.c) {
|
||
CGRect.{ x = 10.5, y = 20.5, width = 30.5, height = 40.5 }
|
||
}
|
||
|
||
u64_imp :: (self: *void, _cmd: *void) -> u64 callconv(.c) {
|
||
// sx integer-literal parser rejects values ≥ 2^63 even when the
|
||
// receiving type is u64, so the leading bit stays clear.
|
||
0x7FEDCBA987654321
|
||
}
|
||
|
||
main :: () -> s32 {
|
||
inline if OS == .macos {
|
||
ns_object := objc_getClass("NSObject".ptr);
|
||
my_cls := objc_allocateClassPair(ns_object, "SxRectU64Probe".ptr, 0);
|
||
|
||
// CGRect type encoding: {CGRect={CGPoint=dd}{CGSize=dd}}@: for a
|
||
// strict structural encoding, but the runtime accepts the
|
||
// flattened `{CGRect=dddd}@:` form for IMP registration since
|
||
// arm64 BOOL/struct returns route on the ABI shape, not on the
|
||
// type-encoding's nested-struct structure.
|
||
sel_rect := sel_registerName("rect".ptr);
|
||
sel_uval := sel_registerName("uval".ptr);
|
||
class_addMethod(my_cls, sel_rect, xx rect_imp, "{CGRect=dddd}@:".ptr);
|
||
class_addMethod(my_cls, sel_uval, xx u64_imp, "Q@:".ptr);
|
||
objc_registerClassPair(my_cls);
|
||
|
||
instance := class_createInstance(my_cls, 0);
|
||
|
||
r := #objc_call(CGRect)(instance, "rect");
|
||
print("rect = ({}, {}, {}, {})\n", r.x, r.y, r.width, r.height);
|
||
|
||
u := #objc_call(u64)(instance, "uval");
|
||
print("uval = {}\n", u);
|
||
}
|
||
inline if OS != .macos {
|
||
print("skipped (not macos)\n");
|
||
}
|
||
0
|
||
}
|