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).
168 lines
4.3 KiB
Plaintext
Executable File
168 lines
4.3 KiB
Plaintext
Executable File
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
|
|
// --- Lerpable protocol (inline — static dispatch, no vtable) ---
|
|
|
|
Lerpable :: protocol #inline {
|
|
lerp :: (b: Self, t: f32) -> Self;
|
|
}
|
|
|
|
// --- Easing Functions ---
|
|
|
|
ease_linear :: (t: f32) -> f32 { t }
|
|
ease_in_quad :: (t: f32) -> f32 { t * t }
|
|
ease_out_quad :: (t: f32) -> f32 { t * (2.0 - t) }
|
|
ease_in_out_quad :: (t: f32) -> f32 {
|
|
if t < 0.5 then 2.0 * t * t
|
|
else -1.0 + (4.0 - 2.0 * t) * t
|
|
}
|
|
ease_out_cubic :: (t: f32) -> f32 { u := t - 1.0; u * u * u + 1.0 }
|
|
|
|
// --- AnimatedFloat — duration-based ---
|
|
|
|
AnimatedFloat :: struct {
|
|
current: f32;
|
|
from: f32;
|
|
to: f32;
|
|
elapsed: f32;
|
|
duration: f32;
|
|
easing: ?Closure(f32) -> f32;
|
|
active: bool;
|
|
|
|
make :: (value: f32) -> AnimatedFloat {
|
|
AnimatedFloat.{
|
|
current = value,
|
|
from = value,
|
|
to = value,
|
|
elapsed = 0.0,
|
|
duration = 0.0,
|
|
easing = null,
|
|
active = false
|
|
}
|
|
}
|
|
|
|
animate_to :: (self: *AnimatedFloat, target: f32, dur: f32, ease: Closure(f32) -> f32) {
|
|
self.from = self.current;
|
|
self.to = target;
|
|
self.elapsed = 0.0;
|
|
self.duration = dur;
|
|
self.easing = ease;
|
|
self.active = true;
|
|
}
|
|
|
|
tick :: (self: *AnimatedFloat, dt: f32) {
|
|
if !self.active { return; }
|
|
self.elapsed += dt;
|
|
t := clamp(self.elapsed / self.duration, 0.0, 1.0);
|
|
eased := if ease := self.easing { ease(t) } else { t };
|
|
self.current = self.from + (self.to - self.from) * eased;
|
|
if t >= 1.0 {
|
|
self.current = self.to;
|
|
self.active = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- SpringFloat — physics-based ---
|
|
|
|
SpringFloat :: struct {
|
|
current: f32;
|
|
velocity: f32;
|
|
target: f32;
|
|
stiffness: f32;
|
|
damping: f32;
|
|
mass: f32;
|
|
threshold: f32;
|
|
|
|
make :: (value: f32) -> SpringFloat {
|
|
SpringFloat.{
|
|
current = value,
|
|
velocity = 0.0,
|
|
target = value,
|
|
stiffness = 200.0,
|
|
damping = 20.0,
|
|
mass = 1.0,
|
|
threshold = 0.01
|
|
}
|
|
}
|
|
|
|
snappy :: (value: f32) -> SpringFloat {
|
|
SpringFloat.{
|
|
current = value,
|
|
velocity = 0.0,
|
|
target = value,
|
|
stiffness = 300.0,
|
|
damping = 25.0,
|
|
mass = 1.0,
|
|
threshold = 0.01
|
|
}
|
|
}
|
|
|
|
tick :: (self: *SpringFloat, dt: f32) {
|
|
if self.is_settled() { return; }
|
|
force := 0.0 - self.stiffness * (self.current - self.target);
|
|
damping_force := 0.0 - self.damping * self.velocity;
|
|
accel := (force + damping_force) / self.mass;
|
|
self.velocity += accel * dt;
|
|
self.current += self.velocity * dt;
|
|
}
|
|
|
|
is_settled :: (self: *SpringFloat) -> bool {
|
|
abs(self.current - self.target) < self.threshold
|
|
and abs(self.velocity) < self.threshold
|
|
}
|
|
}
|
|
|
|
// --- Animated(T) — generic duration-based animation for any Lerpable type ---
|
|
|
|
Animated :: struct ($T: Lerpable) {
|
|
current: T;
|
|
from: T;
|
|
to: T;
|
|
elapsed: f32;
|
|
duration: f32;
|
|
active: bool;
|
|
|
|
make :: (value: T) -> Animated(T) {
|
|
Animated(T).{
|
|
current = value,
|
|
from = value,
|
|
to = value,
|
|
elapsed = 0.0,
|
|
duration = 0.0,
|
|
active = false
|
|
}
|
|
}
|
|
|
|
// Jump immediately to value (no animation). Used to avoid animating from zero on first layout.
|
|
set_immediate :: (self: *Animated(T), value: T) {
|
|
self.current = value;
|
|
self.from = value;
|
|
self.to = value;
|
|
self.elapsed = 0.0;
|
|
self.active = false;
|
|
}
|
|
|
|
// Start animating towards target.
|
|
animate_to :: (self: *Animated(T), target: T, dur: f32) {
|
|
self.from = self.current;
|
|
self.to = target;
|
|
self.elapsed = 0.0;
|
|
self.duration = dur;
|
|
self.active = true;
|
|
}
|
|
|
|
tick :: (self: *Animated(T), dt: f32) {
|
|
if !self.active { return; }
|
|
self.elapsed += dt;
|
|
t := clamp(self.elapsed / self.duration, 0.0, 1.0);
|
|
self.current = self.from.lerp(self.to, t);
|
|
if t >= 1.0 {
|
|
self.current = self.to;
|
|
self.active = false;
|
|
}
|
|
}
|
|
|
|
is_animating :: (self: *Animated(T)) -> bool { self.active }
|
|
}
|