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
1.0 KiB
Plaintext
29 lines
1.0 KiB
Plaintext
// Failable calls in cleanup bodies must be absorbed locally (ERR step E1.7). A
|
|
// `defer` / `onfail` body runs while the block is already exiting, so a failable
|
|
// it calls has nowhere to propagate — it must be handled in place with `catch`
|
|
// or an `or <value>` terminator. This file shows the accepted forms; the bare
|
|
// (un-absorbed) form is rejected in 1049.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Bad }
|
|
|
|
failing :: () -> !E { raise error.Bad; }
|
|
recover :: () -> i32 !E { raise error.Bad; }
|
|
|
|
work :: (n: i32) -> !E {
|
|
defer print("defer: always\n"); // plain cleanup
|
|
onfail { failing() catch (e) print("onfail: caught (catch)\n"); } // catch absorbs
|
|
onfail { x := recover() or 7; print("onfail: x={} (or)\n", x); } // or-value absorbs
|
|
if n < 0 { raise error.Bad; }
|
|
return;
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
print("[error]\n");
|
|
a := work(-1); // raises → onfail bodies fire, then defer (reverse decl order)
|
|
print("[ok]\n");
|
|
b := work(2); // success → only defer fires
|
|
return 0;
|
|
}
|