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.
30 lines
1.2 KiB
Plaintext
30 lines
1.2 KiB
Plaintext
// Phase 4.2 — the canonical `Combined` struct's storage layer: a generic
|
|
// struct whose field is a pack of PARAMETERIZED-protocol values,
|
|
// `sources: (..VL(Ts))` → `(VL(T0), VL(T1), …)`. Each `VL(Ti)` is a real
|
|
// 16-byte protocol value (issue: parameterized-protocol value types), and
|
|
// `(..VL(Ts))` applies `VL` per pack element. Instantiate + whole-tuple store
|
|
// of `xx`-erased values + per-element method dispatch all work.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
VL :: protocol(T: Type) { get :: (self: *Self) -> T; }
|
|
IntCell :: struct { v: i64; }
|
|
StrCell :: struct { s: string; }
|
|
impl VL(i64) for IntCell { get :: (self: *IntCell) -> i64 => self.v; }
|
|
impl VL(string) for StrCell { get :: (self: *StrCell) -> string => self.s; }
|
|
|
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
|
sources: Tuple(..VL(Ts)); // (VL(T0), VL(T1), …) — tuple of protocol values
|
|
value: $R;
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
// Combined(i64, i64, string): R=i64, Ts=[i64, string],
|
|
// sources: (VL(i64), VL(string)).
|
|
c : Combined(i64, i64, string) = ---;
|
|
c.sources = .(xx IntCell.{ v = 10 }, xx StrCell.{ s = "hi" });
|
|
c.value = 99;
|
|
print("{} {} {}\n", c.sources.0.get(), c.sources.1.get(), c.value); // 10 hi 99
|
|
0
|
|
}
|