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).
58 lines
2.1 KiB
Plaintext
58 lines
2.1 KiB
Plaintext
// M2.1(a) — class-level constants on a sx-defined `#objc_class`.
|
|
//
|
|
// `name :: Type = expr;` inside the class block is sugar for
|
|
// `name :: () -> Type => expr;` — a niladic class method with an
|
|
// expression body. The compiler emits a C-ABI IMP that returns the
|
|
// captured expression and registers it on the metaclass.
|
|
//
|
|
// Apple's runtime sees no distinction — '[Cls foo]' dispatches to
|
|
// our IMP whether the user wrote it as a constant or as a method.
|
|
// The constant form just reads better for static metadata returns
|
|
// (canonical example: '+layerClass' on UIView subclasses).
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
#import "modules/std/objc.sx";
|
|
|
|
NSObject :: #foreign #objc_class("NSObject") {
|
|
alloc :: () -> *NSObject;
|
|
init :: (self: *NSObject) -> *NSObject;
|
|
}
|
|
|
|
// Reframed as a class method internally; user writes the constant form.
|
|
SxThing :: #objc_class("SxThing") {
|
|
counter: s32;
|
|
|
|
// Class-level constant.
|
|
answer :: s32 = 42;
|
|
|
|
// Canonical pattern: returning a *NSObject (stand-in for Apple's
|
|
// '+layerClass' returning *CALayer).
|
|
seedClass :: *NSObject = NSObject.alloc().init();
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
inline if OS == .macos {
|
|
cls : Class = objc_getClass("SxThing".ptr);
|
|
if cls == null { print("FAIL: SxThing not registered\n"); return 1; }
|
|
|
|
// [SxThing answer] → 42
|
|
sel_answer : SEL = sel_registerName("answer".ptr);
|
|
msg_int : (cls: *void, sel: *void) -> s32 callconv(.c) = xx objc_msgSend;
|
|
r := msg_int(cls, sel_answer);
|
|
if r != 42 { print("FAIL: answer expected 42, got {}\n", r); return 1; }
|
|
|
|
// [SxThing seedClass] returns a non-null NSObject.
|
|
sel_seed : SEL = sel_registerName("seedClass".ptr);
|
|
msg_ptr : (cls: *void, sel: *void) -> *void callconv(.c) = xx objc_msgSend;
|
|
seed := msg_ptr(cls, sel_seed);
|
|
if seed == null { print("FAIL: seedClass returned null\n"); return 1; }
|
|
|
|
print("class constants: answer={}, seedClass=ok\n", r);
|
|
}
|
|
inline if OS != .macos {
|
|
print("class constants: answer=42, seedClass=ok\n");
|
|
}
|
|
0
|
|
}
|