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.
32 lines
981 B
Plaintext
32 lines
981 B
Plaintext
// Comptime `#run` of a failable composes with the handlers exactly as at
|
|
// runtime: `catch` absorbs, `or` terminates, a successful bare `#run` yields the
|
|
// value (error channel stripped), and an `onfail` in the evaluated body still
|
|
// runs during comptime unwinding (E5.2).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Bad, Empty }
|
|
|
|
parse :: (n: i32) -> i32 !E {
|
|
if n < 0 { raise error.Bad; }
|
|
if n == 0 { raise error.Empty; }
|
|
return n * 2;
|
|
}
|
|
|
|
guard :: (ok: bool) -> !E {
|
|
onfail print("comptime cleanup\n");
|
|
if !ok { raise error.Bad; }
|
|
return;
|
|
}
|
|
|
|
ok_v :: #run parse(5); // success → 10 (value, error stripped)
|
|
caught :: #run parse(-1) catch (e) 99; // Bad → 99
|
|
ored :: #run parse(0) or 55; // Empty → 55
|
|
|
|
#run guard(false) catch (e) { }; // onfail fires during the comptime unwind
|
|
|
|
main :: () -> i32 {
|
|
print("ok={} caught={} ored={}\n", ok_v, caught, ored);
|
|
return ok_v + caught + ored; // 10 + 99 + 55 = 164
|
|
}
|