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).
26 lines
963 B
Plaintext
26 lines
963 B
Plaintext
// Phase 4.2 (core) — a generic struct with a pack type-param `..$Ts: []Type`
|
|
// and a pack-shaped tuple field `(..$Ts)`. Each instantiation binds the
|
|
// remaining type args as the pack, so the field is a tuple of those per-position
|
|
// types. Storing the whole tuple field and reading its elements both work.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
Box :: struct($R: Type, ..$Ts: []Type) {
|
|
r: $R;
|
|
pair: (..$Ts); // tuple of the pack's element types
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
// Box(s64, s32, string): R=s64, Ts=[s32, string], pair: (s32, string).
|
|
a : Box(s64, s32, string) = ---;
|
|
a.r = 7;
|
|
a.pair = (42, "hi"); // whole-tuple field store
|
|
print("a: r={} 0={} 1={}\n", a.r, a.pair.0, a.pair.1);
|
|
|
|
// A different shape → a different per-position tuple field.
|
|
b : Box(bool, string, bool) = ---; // Ts=[string, bool], pair: (string, bool)
|
|
b.pair = ("x", true);
|
|
print("b: 0={} 1={}\n", b.pair.0, b.pair.1);
|
|
0
|
|
}
|