feat: tuple syntax cutover — Tuple(...) type + .(...) value
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.
This commit is contained in:
@@ -23,27 +23,27 @@ Provider :: protocol {
|
||||
// discriminating wrapped/compound RETURNS
|
||||
getp :: (self: *Self) -> *Box;
|
||||
geto :: (self: *Self) -> ?Box;
|
||||
gett :: (self: *Self) -> (Box, Box);
|
||||
gett :: (self: *Self) -> Tuple(Box, Box);
|
||||
geta :: (self: *Self) -> [2]Box;
|
||||
// routing-only wrapped/compound PARAMS
|
||||
sump :: (self: *Self, p: *Box) -> i32;
|
||||
sumo :: (self: *Self, o: ?Box) -> i32;
|
||||
sums :: (self: *Self, s: []Box) -> i32;
|
||||
suma :: (self: *Self, a: [2]Box) -> i32;
|
||||
sumt :: (self: *Self, t: (Box, Box)) -> i32;
|
||||
sumt :: (self: *Self, t: Tuple(Box, Box)) -> i32;
|
||||
sumn :: (self: *Self, n: *?[]Box) -> i32;
|
||||
}
|
||||
|
||||
impl Provider for Holder {
|
||||
getp :: (self: *Holder) -> *Box { @self.b }
|
||||
geto :: (self: *Holder) -> ?Box { self.b }
|
||||
gett :: (self: *Holder) -> (Box, Box) { (self.b, self.b) }
|
||||
gett :: (self: *Holder) -> Tuple(Box, Box) { .(self.b, self.b) }
|
||||
geta :: (self: *Holder) -> [2]Box { r : [2]Box = ---; r[0] = self.b; r[1] = self.b; r }
|
||||
sump :: (self: *Holder, p: *Box) -> i32 { p.m }
|
||||
sumo :: (self: *Holder, o: ?Box) -> i32 { o!.m }
|
||||
sums :: (self: *Holder, s: []Box) -> i32 { s[0].m }
|
||||
suma :: (self: *Holder, a: [2]Box) -> i32 { a[0].m }
|
||||
sumt :: (self: *Holder, t: (Box, Box)) -> i32 { t.0.m }
|
||||
sumt :: (self: *Holder, t: Tuple(Box, Box)) -> i32 { t.0.m }
|
||||
sumn :: (self: *Holder, n: *?[]Box) -> i32 { if n == null { 0 } else { 6 } }
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ main :: () -> i32 {
|
||||
arr : [2]Box = ---; arr[0].m = 2; arr[1].m = 3;
|
||||
sl : []Box = arr[0..2];
|
||||
osl : ?[]Box = sl;
|
||||
tup : (Box, Box) = (one, one);
|
||||
tup : Tuple(Box, Box) = .(one, one);
|
||||
|
||||
sp := p.sump(@one);
|
||||
so := p.sumo(one);
|
||||
|
||||
Reference in New Issue
Block a user