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).
48 lines
1.5 KiB
Plaintext
48 lines
1.5 KiB
Plaintext
// Phase 1.3 — the closure env-buffer heap-copy in `lowerLambda` must
|
|
// dispatch through `context.allocator`, not `.heap_alloc` directly.
|
|
// So when a `push Context.{ allocator = tracer }` block is active, a
|
|
// capturing closure created inside it MUST allocate its env through
|
|
// the tracker.
|
|
//
|
|
// Mirrors the shape of `130-xx-value-routes-through-context-allocator.sx`
|
|
// for the protocol-erasure heap path — same Tracer, same install via
|
|
// `push Context`, same `Tracer.count = 1` assertion. Different
|
|
// allocation site (closure env vs xx-value heap copy).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
Tracer :: struct {
|
|
count: s64;
|
|
|
|
init :: () -> *Tracer {
|
|
t : *Tracer = xx libc_malloc(size_of(Tracer));
|
|
t.count = 0;
|
|
t
|
|
}
|
|
}
|
|
|
|
impl Allocator for Tracer {
|
|
alloc :: (self: *Tracer, size: s64) -> *void {
|
|
self.count += 1;
|
|
return libc_malloc(size);
|
|
}
|
|
dealloc :: (self: *Tracer, ptr: *void) {
|
|
libc_free(ptr);
|
|
}
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
tracer := Tracer.init();
|
|
push Context.{ allocator = xx tracer, data = null } {
|
|
// Capturing closure. lowerLambda allocates an env struct on the
|
|
// stack, copies the captures in, then heap-copies the env via
|
|
// `allocViaContext` — which dispatches through the installed
|
|
// tracer's `alloc`.
|
|
captured : s64 = 100;
|
|
add_capture := closure((y: s64) -> s64 => y + captured);
|
|
_ = add_capture(1);
|
|
}
|
|
print("Tracer.count = {}\n", tracer.count);
|
|
0
|
|
}
|