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).
64 lines
2.1 KiB
Plaintext
Executable File
64 lines
2.1 KiB
Plaintext
Executable File
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/render.sx";
|
|
#import "modules/ui/events.sx";
|
|
#import "modules/ui/view.sx";
|
|
#import "modules/ui/font.sx";
|
|
|
|
StatsPanel :: struct {
|
|
delta_time: *f32;
|
|
font_size: f32;
|
|
|
|
PADDING :f32: 12.0;
|
|
LINE_SPACING :f32: 4.0;
|
|
TITLE_SIZE :f32: 12.0;
|
|
VALUE_SIZE :f32: 11.0;
|
|
BG_COLOR :Color: Color.rgba(30, 30, 38, 200);
|
|
CORNER_RADIUS:f32: 12.0;
|
|
}
|
|
|
|
impl View for StatsPanel {
|
|
size_that_fits :: (self: *StatsPanel, proposal: ProposedSize) -> Size {
|
|
title_size := measure_text("Statistics", StatsPanel.TITLE_SIZE);
|
|
fps_size := measure_text("FPS: 0000", StatsPanel.VALUE_SIZE);
|
|
w := max(title_size.width, fps_size.width) + StatsPanel.PADDING * 2.0;
|
|
h := title_size.height + StatsPanel.LINE_SPACING + fps_size.height + StatsPanel.PADDING * 2.0;
|
|
Size.{ width = w, height = h }
|
|
}
|
|
|
|
layout :: (self: *StatsPanel, bounds: Frame) {}
|
|
|
|
render :: (self: *StatsPanel, ctx: *RenderContext, frame: Frame) {
|
|
// Background
|
|
ctx.add_rounded_rect(frame, StatsPanel.BG_COLOR, StatsPanel.CORNER_RADIUS);
|
|
|
|
// Title
|
|
title_size := measure_text("Statistics", StatsPanel.TITLE_SIZE);
|
|
title_frame := Frame.make(
|
|
frame.origin.x + StatsPanel.PADDING,
|
|
frame.origin.y + StatsPanel.PADDING,
|
|
title_size.width,
|
|
title_size.height
|
|
);
|
|
ctx.add_text(title_frame, "Statistics", StatsPanel.TITLE_SIZE, COLOR_WHITE);
|
|
|
|
// FPS value
|
|
dt := self.delta_time.*;
|
|
fps : s64 = if dt > 0.0 then xx (1.0 / dt) else 0;
|
|
fps_text := format("FPS: {}", fps);
|
|
fps_size := measure_text(fps_text, StatsPanel.VALUE_SIZE);
|
|
fps_frame := Frame.make(
|
|
frame.origin.x + StatsPanel.PADDING,
|
|
title_frame.max_y() + StatsPanel.LINE_SPACING,
|
|
fps_size.width,
|
|
fps_size.height
|
|
);
|
|
ctx.add_text(fps_frame, fps_text, StatsPanel.VALUE_SIZE, Color.rgba(180, 180, 190, 255));
|
|
}
|
|
|
|
handle_event :: (self: *StatsPanel, event: *Event, frame: Frame) -> bool {
|
|
false
|
|
}
|
|
}
|