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).
88 lines
1.6 KiB
Plaintext
88 lines
1.6 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
|
|
Vec :: struct($N: u32, $T:Type) {
|
|
// <N x T> (LLVM Vector)
|
|
// Vector is a Builtin Type
|
|
data: Vector(N,T);
|
|
}
|
|
|
|
Complex :: ($T:Type) -> Type {
|
|
return struct {
|
|
value: T;
|
|
//..inject
|
|
count: u32;
|
|
};
|
|
}
|
|
|
|
Vec3 :: Vec(3, f32);
|
|
|
|
vec3 :: (x:f32, y:f32, z:f32) -> Vector(3,f32) {
|
|
.[x, y, z]
|
|
}
|
|
|
|
Foo :: Complex(u32);
|
|
|
|
main :: () {
|
|
v1 := Vec3.{data = .[1,3,2]};
|
|
print("v1: {}\n", v1);
|
|
//stdout: Vec(3,f32){data: [1.0, 3.0, 2.0]}
|
|
//
|
|
|
|
v2 := vec3(1,3,2);
|
|
print("v2: {}\n", v2);
|
|
//stdout: [1.0, 3.0, 2.0]
|
|
//
|
|
|
|
// [N x T] (LLVM Array)
|
|
buffer : [5]f32 = .[0, 2, 3.5, 4, 0];
|
|
print("buff: {}\n", buffer);
|
|
//stdout: [0.0, 2.0, 3.5, 4.0, 0.0]
|
|
//
|
|
|
|
comp : Foo = .{value = 42, count = 1};
|
|
print("comp: {}\n", comp);
|
|
//stdout: Foo{value: 42, count: 1}
|
|
//
|
|
|
|
// Vector arithmetic
|
|
v3 := vec3(3,2,1);
|
|
add := v2 + v3;
|
|
print("add: {}\n", add);
|
|
|
|
// Element access
|
|
v2x := v2.x;
|
|
print("v2.x: {}\n", v2x);
|
|
|
|
// Index access
|
|
v2i := v2[1];
|
|
print("v2[1]: {}\n", v2i);
|
|
|
|
// Scalar broadcast
|
|
scaled := v2 * 2.0;
|
|
print("scaled: {}\n", scaled);
|
|
|
|
// Negation
|
|
neg := -v2;
|
|
print("neg: {}\n", neg);
|
|
|
|
// sqrt
|
|
s := sqrt(9.0);
|
|
print("sqrt(9): {}\n", s);
|
|
|
|
// inline generic type
|
|
Sx :: (user: $T) -> Type {
|
|
return enum {
|
|
counter: s32;
|
|
user: T;
|
|
};
|
|
}
|
|
|
|
sx := Sx(f32).user(0.5);
|
|
print("{}\n", sx);
|
|
|
|
print("{}\n", size_of(f32));
|
|
print("{}\n", size_of(Sx(f32)));
|
|
print("{}\n", size_of(Foo));
|
|
}
|