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).
61 lines
2.1 KiB
Plaintext
61 lines
2.1 KiB
Plaintext
// Consuming value-carrying failables with `try` and `catch` (ERR step E2.1b —
|
|
// the consumer side of the error-channel tuple ABI). `try f()` on a
|
|
// `-> (T, !E)` callee binds the value slot on success and propagates the error
|
|
// on failure (a pure-failable caller returns the tag; a value-carrying caller
|
|
// returns `{undef, tag}`). `f() catch e BODY` yields the value slot on success
|
|
// or the handler body's value on failure, merged through a block parameter.
|
|
// The producer side is `examples/228-value-failable.sx`.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Bad, Empty }
|
|
|
|
parse :: (n: s32) -> (s32, !E) {
|
|
if n < 0 { raise error.Bad; }
|
|
if n == 0 { raise error.Empty; }
|
|
return n * 2;
|
|
}
|
|
|
|
// value-carrying `try` in a value-carrying caller — propagates {undef, tag}.
|
|
inc :: (n: s32) -> (s32, !E) {
|
|
v := try parse(n);
|
|
return v + 1;
|
|
}
|
|
|
|
// value-carrying `try` in a pure-failable caller — propagates the tag.
|
|
relay :: (n: s32) -> !E {
|
|
v := try parse(n);
|
|
if v < 0 { raise error.Bad; }
|
|
return;
|
|
}
|
|
|
|
// value-carrying `catch`, bare-expression fallback.
|
|
safe :: (n: s32) -> s32 {
|
|
return parse(n) catch e 0;
|
|
}
|
|
|
|
// value-carrying `catch`, match-body value.
|
|
classify :: (n: s32) -> s32 {
|
|
return parse(n) catch e == {
|
|
case .Bad: 1;
|
|
case .Empty: 2;
|
|
else: 3
|
|
};
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
r : s32 = 0;
|
|
a, ea := inc(5); // parse(5)=10 → v=10 → 11
|
|
if !ea { r = r + a; } // success → +11 (value live only when proven ok)
|
|
b, eb := inc(-1); // parse(-1)=Bad → propagate {undef, Bad}
|
|
if eb == error.Bad { r = r + 4; } // true → +4
|
|
er := relay(3); // parse(3)=6 ok → relay ok
|
|
if er == error.Bad { r = r + 50; } // false
|
|
r = r + safe(7); // parse(7)=14 → +14
|
|
r = r + safe(-1); // Bad → catch → 0
|
|
r = r + classify(-1); // Bad → 1
|
|
r = r + classify(0); // Empty → 2
|
|
print("consume result: {}\n", r); // 11+4+14+0+1+2 = 32
|
|
return r;
|
|
}
|