Files
sx/library/modules/ui/events.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

134 lines
3.7 KiB
Plaintext
Executable File

#import "modules/std.sx";
#import "modules/sdl3.sx";
#import "modules/ui/types.sx";
MouseButton :: enum {
none;
left;
middle;
right;
}
MouseButtonData :: struct { position: Point; button: MouseButton; }
MouseMotionData :: struct { position: Point; delta: Point; }
MouseWheelData :: struct { position: Point; delta: Point; }
// Platform-neutral keycode. Each backend translates its native codes to this
// (see `keycode_from_sdl`), so app code never depends on a platform key enum.
Keycode :: enum {
unknown;
escape;
enter;
space;
tab;
backspace;
delete;
left;
right;
up;
down;
}
KeyData :: struct { key: Keycode; }
ResizeData :: struct { size: Size; }
Event :: enum {
none;
quit;
mouse_down: MouseButtonData;
mouse_up: MouseButtonData;
mouse_moved: MouseMotionData;
mouse_wheel: MouseWheelData;
key_down: KeyData;
key_up: KeyData;
text_input: string;
window_resize: ResizeData;
}
event_position :: (e: *Event) -> ?Point {
if e == {
case .mouse_down: (d) { return d.position; }
case .mouse_up: (d) { return d.position; }
case .mouse_moved: (d) { return d.position; }
case .mouse_wheel: (d) { return d.position; }
}
null
}
// Map a platform (SDL) keycode to the neutral `Keycode`. Only the keys the app
// consumes are mapped; everything else is `.unknown`. Letters/digits arrive via
// `text_input`, not here.
// TODO: extend as more keys are needed.
keycode_from_sdl :: (k: SDL_Keycode) -> Keycode {
if k == {
case .escape: return .escape;
case .return_key: return .enter;
case .space: return .space;
case .tab: return .tab;
case .backspace: return .backspace;
case .delete_key: return .delete;
case .left: return .left;
case .right: return .right;
case .up: return .up;
case .down: return .down;
}
.unknown
}
// Translate SDL_Event → our Event type
translate_sdl_event :: (sdl: *SDL_Event) -> Event {
if sdl == {
case .quit: {
return .quit;
}
case .key_down: (data) {
return .key_down(.{ key = keycode_from_sdl(data.key) });
}
case .key_up: (data) {
return .key_up(.{ key = keycode_from_sdl(data.key) });
}
case .mouse_motion: (data) {
return .mouse_moved(.{
position = .{ x = data.x, y = data.y },
delta = .{ x = data.xrel, y = data.yrel }
});
}
case .mouse_button_down: (data) {
btn :MouseButton = if data.button == {
case 1: .left;
case 2: .middle;
case 3: .right;
else: .none;
};
return .mouse_down(.{
position = .{ x = data.x, y = data.y },
button = btn
});
}
case .mouse_button_up: (data) {
btn :MouseButton = if data.button == {
case 1: .left;
case 2: .middle;
case 3: .right;
else: .none;
};
return .mouse_up(.{
position = .{ x = data.x, y = data.y },
button = btn
});
}
case .mouse_wheel: (data) {
return .mouse_wheel(.{
position = .{ x = data.mouse_x, y = data.mouse_y },
delta = .{ x = data.x, y = data.y }
});
}
case .window_resized: (data) {
return .window_resize(.{
size = .{ width = xx data.data1, height = xx data.data2 }
});
}
}
.none
}