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).
30 lines
1.2 KiB
Plaintext
30 lines
1.2 KiB
Plaintext
// Phase 4.2 — the canonical `Combined` struct's storage layer: a generic
|
|
// struct whose field is a pack of PARAMETERIZED-protocol values,
|
|
// `sources: (..VL(Ts))` → `(VL(T0), VL(T1), …)`. Each `VL(Ti)` is a real
|
|
// 16-byte protocol value (issue: parameterized-protocol value types), and
|
|
// `(..VL(Ts))` applies `VL` per pack element. Instantiate + whole-tuple store
|
|
// of `xx`-erased values + per-element method dispatch all work.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
VL :: protocol(T: Type) { get :: () -> T; }
|
|
IntCell :: struct { v: s64; }
|
|
StrCell :: struct { s: string; }
|
|
impl VL(s64) for IntCell { get :: (self: *IntCell) -> s64 => self.v; }
|
|
impl VL(string) for StrCell { get :: (self: *StrCell) -> string => self.s; }
|
|
|
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
|
sources: (..VL(Ts)); // (VL(T0), VL(T1), …) — tuple of protocol values
|
|
value: $R;
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
// Combined(s64, s64, string): R=s64, Ts=[s64, string],
|
|
// sources: (VL(s64), VL(string)).
|
|
c : Combined(s64, s64, string) = ---;
|
|
c.sources = (xx IntCell.{ v = 10 }, xx StrCell.{ s = "hi" });
|
|
c.value = 99;
|
|
print("{} {} {}\n", c.sources.0.get(), c.sources.1.get(), c.value); // 10 hi 99
|
|
0
|
|
}
|