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).
92 lines
2.7 KiB
Plaintext
Executable File
92 lines
2.7 KiB
Plaintext
Executable File
#import "modules/std.sx";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/render.sx";
|
|
#import "modules/ui/events.sx";
|
|
#import "modules/ui/view.sx";
|
|
#import "modules/ui/label.sx";
|
|
#import "modules/ui/font.sx";
|
|
|
|
ButtonStyle :: struct {
|
|
background: Color;
|
|
foreground: Color;
|
|
hover_bg: Color;
|
|
pressed_bg: Color;
|
|
corner_radius: f32;
|
|
padding: EdgeInsets;
|
|
|
|
default :: () -> ButtonStyle {
|
|
ButtonStyle.{
|
|
background = COLOR_BLUE,
|
|
foreground = COLOR_WHITE,
|
|
hover_bg = Color.rgb(0, 100, 220),
|
|
pressed_bg = Color.rgb(0, 80, 180),
|
|
corner_radius = 6.0,
|
|
padding = EdgeInsets.symmetric(16.0, 8.0)
|
|
}
|
|
}
|
|
}
|
|
|
|
Button :: struct {
|
|
label: string;
|
|
font_size: f32;
|
|
style: ButtonStyle;
|
|
on_tap: ?Closure();
|
|
hovered: bool;
|
|
pressed: bool;
|
|
|
|
}
|
|
|
|
impl View for Button {
|
|
size_that_fits :: (self: *Button, proposal: ProposedSize) -> Size {
|
|
text_size := measure_text(self.label, self.font_size);
|
|
Size.{
|
|
width = text_size.width + self.style.padding.horizontal(),
|
|
height = text_size.height + self.style.padding.vertical()
|
|
}
|
|
}
|
|
|
|
layout :: (self: *Button, bounds: Frame) {}
|
|
|
|
render :: (self: *Button, ctx: *RenderContext, frame: Frame) {
|
|
bg := if self.pressed then self.style.pressed_bg
|
|
else if self.hovered then self.style.hover_bg
|
|
else self.style.background;
|
|
|
|
ctx.add_rounded_rect(frame, bg, self.style.corner_radius);
|
|
|
|
// Text centered in frame
|
|
text_size := measure_text(self.label, self.font_size);
|
|
text_x := frame.origin.x + (frame.size.width - text_size.width) * 0.5;
|
|
text_y := frame.origin.y + (frame.size.height - text_size.height) * 0.5;
|
|
text_frame := Frame.make(text_x, text_y, text_size.width, text_size.height);
|
|
ctx.add_text(text_frame, self.label, self.font_size, self.style.foreground);
|
|
}
|
|
|
|
handle_event :: (self: *Button, event: *Event, frame: Frame) -> bool {
|
|
if event.* == {
|
|
case .mouse_moved: (d) {
|
|
self.hovered = frame.contains(d.position);
|
|
return false;
|
|
}
|
|
case .mouse_down: (d) {
|
|
if frame.contains(d.position) {
|
|
self.pressed = true;
|
|
return true;
|
|
}
|
|
}
|
|
case .mouse_up: (d) {
|
|
if self.pressed {
|
|
self.pressed = false;
|
|
if frame.contains(d.position) {
|
|
if handler := self.on_tap {
|
|
handler();
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|