Files
sx/library/modules/ui/stacks.sx
agra bdd0e96d78 feat(lang): block value requires no trailing ; (Rust-style)
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).
2026-06-02 09:23:50 +03:00

182 lines
4.9 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/layout.sx";
VStack :: struct {
children: List(ViewChild);
spacing: f32;
alignment: HAlignment;
add :: (self: *VStack, view: View) {
self.children.append(.{ view = view });
}
}
impl View for VStack {
size_that_fits :: (self: *VStack, proposal: ProposedSize) -> Size {
measure_vstack(@self.children, proposal, self.spacing)
}
layout :: (self: *VStack, bounds: Frame) {
layout_vstack(@self.children, bounds, self.spacing, self.alignment);
}
render :: (self: *VStack, ctx: *RenderContext, frame: Frame) {
i := 0;
while i < self.children.len {
child := @self.children.items[i];
child.view.render(ctx, child.computed_frame);
i += 1;
}
}
handle_event :: (self: *VStack, event: *Event, frame: Frame) -> bool {
// Iterate children in reverse (front-to-back for overlapping)
i := self.children.len - 1;
while i >= 0 {
child := @self.children.items[i];
if child.view.handle_event(event, child.computed_frame) {
return true;
}
i -= 1;
}
false
}
}
HStack :: struct {
children: List(ViewChild);
spacing: f32;
alignment: VAlignment;
add :: (self: *HStack, view: View) {
self.children.append(.{ view = view });
}
}
impl View for HStack {
size_that_fits :: (self: *HStack, proposal: ProposedSize) -> Size {
measure_hstack(@self.children, proposal, self.spacing)
}
layout :: (self: *HStack, bounds: Frame) {
layout_hstack(@self.children, bounds, self.spacing, self.alignment);
}
render :: (self: *HStack, ctx: *RenderContext, frame: Frame) {
i := 0;
while i < self.children.len {
child := @self.children.items[i];
child.view.render(ctx, child.computed_frame);
i += 1;
}
}
handle_event :: (self: *HStack, event: *Event, frame: Frame) -> bool {
i := self.children.len - 1;
while i >= 0 {
child := @self.children.items[i];
if child.view.handle_event(event, child.computed_frame) {
return true;
}
i -= 1;
}
false
}
}
ZStack :: struct {
children: List(ViewChild);
alignment: Alignment;
add :: (self: *ZStack, view: View) {
self.children.append(.{ view = view });
}
}
impl View for ZStack {
size_that_fits :: (self: *ZStack, proposal: ProposedSize) -> Size {
measure_zstack(@self.children, proposal)
}
layout :: (self: *ZStack, bounds: Frame) {
layout_zstack(@self.children, bounds, self.alignment);
}
render :: (self: *ZStack, ctx: *RenderContext, frame: Frame) {
// Render back-to-front (first child is bottommost)
i := 0;
while i < self.children.len {
child := @self.children.items[i];
child.view.render(ctx, child.computed_frame);
i += 1;
}
}
handle_event :: (self: *ZStack, event: *Event, frame: Frame) -> bool {
// Handle front-to-back (last child is topmost)
i := self.children.len - 1;
while i >= 0 {
child := @self.children.items[i];
if child.view.handle_event(event, child.computed_frame) {
return true;
}
i -= 1;
}
false
}
}
// Spacer — fills available space
Spacer :: struct {
min_length: f32;
}
impl View for Spacer {
size_that_fits :: (self: *Spacer, proposal: ProposedSize) -> Size {
w := proposal.width ?? self.min_length;
h := proposal.height ?? self.min_length;
Size.{ width = max(w, self.min_length), height = max(h, self.min_length) }
}
layout :: (self: *Spacer, bounds: Frame) {}
render :: (self: *Spacer, ctx: *RenderContext, frame: Frame) {}
handle_event :: (self: *Spacer, event: *Event, frame: Frame) -> bool { false }
}
// Rect — simple colored rectangle view
RectView :: struct {
color: Color;
corner_radius: f32;
preferred_width: f32;
preferred_height: f32;
}
impl View for RectView {
size_that_fits :: (self: *RectView, proposal: ProposedSize) -> Size {
w := proposal.width ?? self.preferred_width;
h := proposal.height ?? self.preferred_height;
Size.{ width = w, height = h }
}
layout :: (self: *RectView, bounds: Frame) {}
render :: (self: *RectView, ctx: *RenderContext, frame: Frame) {
if self.corner_radius > 0.0 {
ctx.add_rounded_rect(frame, self.color, self.corner_radius);
} else {
ctx.add_rect(frame, self.color);
}
}
handle_event :: (self: *RectView, event: *Event, frame: Frame) -> bool { false }
}