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.
29 lines
1012 B
Plaintext
29 lines
1012 B
Plaintext
// Phase 6 — `c.sources = (..sources)`: materialize a pack into a
|
|
// protocol-typed tuple field, erasing each concrete pack element to the field's
|
|
// protocol slot. The pack `..sources: VL` holds concrete cells; `(..sources)`
|
|
// into a `(..VL(Ts))` field `xx`-erases each to its `VL(Ti)` value.
|
|
|
|
#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));
|
|
value: $R;
|
|
}
|
|
|
|
build :: (..sources: VL) -> void {
|
|
c : Combined(i64, ..sources.T) = ---;
|
|
c.sources = .(..sources); // pack → tuple, per-element erase
|
|
print("{} {}\n", c.sources.0.get(), c.sources.1.get());
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
build(IntCell.{ v = 10 }, StrCell.{ s = "hi" }); // 10 hi
|
|
0
|
|
}
|