989e18b760
Replace the bare-paren tuple grammar with explicit, position-unambiguous
forms, mirroring how structs work:
type `(A, B)` -> `Tuple(A, B)` (named keeps `:`)
value `(a, b)` -> `.(a, b)` (named uses `=`)
typed (new) -> `Tuple(A, B).(a, b)` (like `Point.{...}`)
failable `-> (T, !)` -> `-> T !`
`-> (T1, T2, !)`-> `-> Tuple(T1, T2) !` (channel outside Tuple)
Bare `(...)` is now grouping only, everywhere; a comma in bare parens is a
hard error with a migration hint. Grouping, function types `(A, B) -> R`,
param lists, lambdas, and match bindings are unaffected.
`Tuple(...)` is strictly a TYPE in every position (including `size_of` /
`type_info` args); a tuple VALUE comes only from `.(...)` (anonymous) or
`Tuple(...).(...)` (explicitly typed). A bare `Tuple(1, 2)` is a tuple
type with non-type elements -> rejected.
The ~110 tuple-bearing corpus files were migrated with a one-shot
AST-aware migrator (the `sx migrate` tool from the prior commit, removed
here). New examples: 0130 (new syntax), 0131 (typed construction), 1060
(named-tuple failable return). 1116 golden updated for the new hint text.
129 lines
3.7 KiB
Plaintext
129 lines
3.7 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/events.sx";
|
|
|
|
GesturePhase :: enum {
|
|
possible;
|
|
began;
|
|
changed;
|
|
ended;
|
|
cancelled;
|
|
failed;
|
|
}
|
|
|
|
// --- TapGesture ---
|
|
|
|
TapValue :: struct {
|
|
location: Point;
|
|
count: i32;
|
|
}
|
|
|
|
TapGesture :: struct {
|
|
count: i32;
|
|
on_tap: ?Closure();
|
|
phase: GesturePhase;
|
|
tap_count: i32;
|
|
start_position: Point;
|
|
|
|
TAP_THRESHOLD :f32: 10.0;
|
|
|
|
handle_event :: (self: *TapGesture, event: *Event, frame: Frame) -> bool {
|
|
if event.* == {
|
|
case .mouse_down: (d) {
|
|
if frame.contains(d.position) {
|
|
self.phase = .began;
|
|
self.start_position = d.position;
|
|
return true;
|
|
}
|
|
}
|
|
case .mouse_moved: (d) {
|
|
if self.phase == .began {
|
|
if self.start_position.distance(d.position) > TapGesture.TAP_THRESHOLD {
|
|
self.phase = .failed;
|
|
}
|
|
}
|
|
}
|
|
case .mouse_up: (d) {
|
|
if self.phase == .began {
|
|
if frame.contains(d.position) {
|
|
self.tap_count += 1;
|
|
if self.tap_count >= self.count {
|
|
if handler := self.on_tap { handler(); }
|
|
self.tap_count = 0;
|
|
}
|
|
}
|
|
}
|
|
self.phase = .possible;
|
|
return true;
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|
|
|
|
// --- DragGesture ---
|
|
|
|
DragValue :: struct {
|
|
location: Point;
|
|
start_location: Point;
|
|
translation: Point;
|
|
}
|
|
|
|
DragGesture :: struct {
|
|
min_distance: f32;
|
|
on_changed: ?Closure(DragValue);
|
|
on_ended: ?Closure(DragValue);
|
|
phase: GesturePhase;
|
|
start_location: Point;
|
|
current_location: Point;
|
|
|
|
make_value :: (self: *DragGesture) -> DragValue {
|
|
DragValue.{
|
|
location = self.current_location,
|
|
start_location = self.start_location,
|
|
translation = self.current_location.sub(self.start_location)
|
|
}
|
|
}
|
|
|
|
handle_event :: (self: *DragGesture, event: *Event, frame: Frame) -> bool {
|
|
if event.* == {
|
|
case .mouse_down: (d) {
|
|
if frame.contains(d.position) {
|
|
self.phase = .possible;
|
|
self.start_location = d.position;
|
|
self.current_location = d.position;
|
|
return true;
|
|
}
|
|
}
|
|
case .mouse_moved: (d) {
|
|
if self.phase == .possible {
|
|
self.current_location = d.position;
|
|
if self.start_location.distance(d.position) >= self.min_distance {
|
|
self.phase = .began;
|
|
if handler := self.on_changed { handler(self.make_value()); }
|
|
}
|
|
return true;
|
|
}
|
|
if self.phase == .began or self.phase == .changed {
|
|
self.current_location = d.position;
|
|
self.phase = .changed;
|
|
if handler := self.on_changed { handler(self.make_value()); }
|
|
return true;
|
|
}
|
|
}
|
|
case .mouse_up: (d) {
|
|
if self.phase == .began or self.phase == .changed {
|
|
self.current_location = d.position;
|
|
self.phase = .ended;
|
|
if handler := self.on_ended { handler(self.make_value()); }
|
|
self.phase = .possible;
|
|
return true;
|
|
}
|
|
self.phase = .possible;
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|