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.
61 lines
2.1 KiB
Plaintext
61 lines
2.1 KiB
Plaintext
// Consuming value-carrying failables with `try` and `catch` (ERR step E2.1b —
|
|
// the consumer side of the error-channel tuple ABI). `try f()` on a
|
|
// `-> (T, !E)` callee binds the value slot on success and propagates the error
|
|
// on failure (a pure-failable caller returns the tag; a value-carrying caller
|
|
// returns `{undef, tag}`). `f() catch (e) BODY` yields the value slot on success
|
|
// or the handler body's value on failure, merged through a block parameter.
|
|
// The producer side is `examples/228-value-failable.sx`.
|
|
|
|
#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;
|
|
}
|
|
|
|
// value-carrying `try` in a value-carrying caller — propagates {undef, tag}.
|
|
inc :: (n: i32) -> i32 !E {
|
|
v := try parse(n);
|
|
return v + 1;
|
|
}
|
|
|
|
// value-carrying `try` in a pure-failable caller — propagates the tag.
|
|
relay :: (n: i32) -> !E {
|
|
v := try parse(n);
|
|
if v < 0 { raise error.Bad; }
|
|
return;
|
|
}
|
|
|
|
// value-carrying `catch`, bare-expression fallback.
|
|
safe :: (n: i32) -> i32 {
|
|
return parse(n) catch (e) 0;
|
|
}
|
|
|
|
// value-carrying `catch`, match-body value.
|
|
classify :: (n: i32) -> i32 {
|
|
return parse(n) catch (e) == {
|
|
case .Bad: 1;
|
|
case .Empty: 2;
|
|
else: 3
|
|
};
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
r : i32 = 0;
|
|
a, ea := inc(5); // parse(5)=10 → v=10 → 11
|
|
if !ea { r = r + a; } // success → +11 (value live only when proven ok)
|
|
b, eb := inc(-1); // parse(-1)=Bad → propagate {undef, Bad}
|
|
if eb == error.Bad { r = r + 4; } // true → +4
|
|
er := relay(3); // parse(3)=6 ok → relay ok
|
|
if er == error.Bad { r = r + 50; } // false
|
|
r = r + safe(7); // parse(7)=14 → +14
|
|
r = r + safe(-1); // Bad → catch → 0
|
|
r = r + classify(-1); // Bad → 1
|
|
r = r + classify(0); // Empty → 2
|
|
print("consume result: {}\n", r); // 11+4+14+0+1+2 = 32
|
|
return r;
|
|
}
|