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.
28 lines
965 B
Plaintext
28 lines
965 B
Plaintext
// Phase 6 — pack-spread in a parameterized-type's arg list:
|
|
// `Combined($R, ..sources.T)`. Inside a pack-fn, `..sources.T` projects each
|
|
// source's protocol type-arg and spreads them into the generic struct's pack
|
|
// type-param `..$Ts`, so `Combined(i64, ..sources.T)` for a single `VL(i64)`
|
|
// source instantiates `Combined(i64, i64)` (field `sources: (VL(i64))`).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
VL :: protocol(T: Type) { get :: (self: *Self) -> T; }
|
|
IntCell :: struct { v: i64; }
|
|
impl VL(i64) for IntCell { get :: (self: *IntCell) -> i64 => self.v; }
|
|
|
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
|
sources: Tuple(..VL(Ts));
|
|
value: $R;
|
|
}
|
|
|
|
make :: (..sources: VL) -> i64 {
|
|
c : Combined(i64, ..sources.T) = ---; // instantiate with the spread type-arg
|
|
c.sources.0 = xx sources[0]; // erase the concrete source to VL(i64)
|
|
return c.sources.0.get();
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
print("{}\n", make(IntCell.{ v = 7 })); // 7
|
|
0
|
|
}
|