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.
26 lines
775 B
Plaintext
26 lines
775 B
Plaintext
// A value-position block (`x := { … }`, a call argument, …) parses any
|
|
// statement form in its body — including a destructure decl — and yields its
|
|
// trailing expression as the value. Previously a braced value block routed
|
|
// through a restricted expression parser that rejected destructures with
|
|
// "expected ';'".
|
|
//
|
|
// Regression (issue 0065).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
pair :: () -> Tuple(i32, i32) { .(5, 7) }
|
|
|
|
main :: () -> i32 {
|
|
// destructure decl inside a value-bound block
|
|
sum := {
|
|
a, b := pair();
|
|
a + b // trailing expression → the block's value
|
|
};
|
|
print("sum: {}\n", sum); // 12
|
|
|
|
// block expression directly as a call argument
|
|
print("sq: {}\n", { x := 4; x * x }); // 16
|
|
|
|
sum
|
|
}
|