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.
63 lines
1.6 KiB
Plaintext
63 lines
1.6 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/std/mem.sx";
|
|
|
|
// --- State(T) — a handle to persistent storage ---
|
|
|
|
State :: struct ($T: Type) {
|
|
ptr: *T;
|
|
|
|
get :: (self: State(T)) -> T { self.ptr.* }
|
|
|
|
set :: (self: State(T), val: T) { self.ptr.* = val; }
|
|
}
|
|
|
|
// --- StateEntry — type-erased storage ---
|
|
|
|
StateEntry :: struct {
|
|
id: i64;
|
|
data: [*]u8;
|
|
size: i64;
|
|
generation: i64;
|
|
}
|
|
|
|
// --- StateStore — manages persistent state ---
|
|
|
|
StateStore :: struct {
|
|
entries: List(StateEntry);
|
|
current_generation: i64;
|
|
parent_allocator: Allocator;
|
|
|
|
init :: (self: *StateStore) {
|
|
self.entries = List(StateEntry).{};
|
|
self.current_generation = 0;
|
|
self.parent_allocator = context.allocator;
|
|
}
|
|
|
|
get_or_create :: (self: *StateStore, id: i64, $T: Type, default: T) -> State(T) {
|
|
// Search for existing entry
|
|
i : i64 = 0;
|
|
while i < self.entries.len {
|
|
if self.entries.items[i].id == id {
|
|
self.entries.items[i].generation = self.current_generation;
|
|
return State(T).{ ptr = xx self.entries.items[i].data };
|
|
}
|
|
i += 1;
|
|
}
|
|
|
|
// Create new entry
|
|
data : [*]u8 = xx self.parent_allocator.alloc_bytes(size_of(T));
|
|
memcpy(data, @default, size_of(T));
|
|
self.entries.append(.{
|
|
id = id,
|
|
data = data,
|
|
size = size_of(T),
|
|
generation = self.current_generation
|
|
}, self.parent_allocator);
|
|
State(T).{ ptr = xx data }
|
|
}
|
|
|
|
next_frame :: (self: *StateStore) {
|
|
self.current_generation += 1;
|
|
}
|
|
}
|