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
835 B
Plaintext
28 lines
835 B
Plaintext
// A braced `defer { … }` body parses as a full statement block (like `onfail`),
|
|
// so it supports every statement form — a destructure decl, a `catch`-statement,
|
|
// nested var decls — not just a single bare expression. Previously `defer { … }`
|
|
// routed through the expression parser and rejected those with "expected ';'".
|
|
//
|
|
// Regression (issue 0065).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Bad }
|
|
|
|
probe :: () -> i32 !E { return 21; }
|
|
failing :: () -> !E { raise error.Bad; }
|
|
|
|
run :: () {
|
|
defer {
|
|
v, e := probe(); // destructure decl
|
|
if !e { print("defer: v={}\n", v); } // value live under the guard
|
|
failing() catch (x) print("defer: caught\n"); // catch-statement absorbs
|
|
}
|
|
print("body\n");
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
run();
|
|
return 0;
|
|
}
|