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).
37 lines
1.4 KiB
Plaintext
37 lines
1.4 KiB
Plaintext
// Phase 6 — the canonical heterogeneous `map`, end to end. A pack-fn whose
|
|
// return type `$R` is inferred from the mapper's closure return:
|
|
// - `mapper: Closure(..sources.T) -> $R` types the lambda's params from the
|
|
// projected pack element types, and its body (`a + b`) drives `$R`.
|
|
// - `$R` is inferred at the call site from the lowered mapper's closure ret,
|
|
// bound into the mono (`-> VL($R)` ⇒ `VL(s64)`, `Combined($R, ..)` ⇒
|
|
// `Combined(s64, ..)`), and folded into the mangle.
|
|
// - `(..sources)` materializes the pack into the `(..VL(Ts))` field (per-element
|
|
// erase) and `mapper(..sources.get)` projects+spreads; `xx c` erases the
|
|
// generic-struct instance to `VL(s64)` via the generic impl's monomorphized
|
|
// thunk.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
VL :: protocol(T: Type) { get :: () -> T; }
|
|
IntCell :: struct { v: s64; }
|
|
impl VL(s64) for IntCell { get :: (self: *IntCell) -> s64 => self.v; }
|
|
|
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
|
sources: (..VL(Ts));
|
|
value: $R;
|
|
}
|
|
impl VL($R) for Combined($R, ..$Ts) { get :: (self: *Combined) -> $R => self.value; }
|
|
|
|
map :: (mapper: Closure(..sources.T) -> $R, ..sources: VL) -> VL($R) {
|
|
c : Combined($R, ..sources.T) = ---;
|
|
c.sources = (..sources);
|
|
c.value = mapper(..sources.get);
|
|
return xx c;
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
r := map((a, b) => a + b, IntCell.{ v = 40 }, IntCell.{ v = 2 });
|
|
print("{}\n", r.get()); // 42
|
|
0
|
|
}
|