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.
35 lines
1.7 KiB
Plaintext
35 lines
1.7 KiB
Plaintext
// Failable closure composition (ERR E5.1): a closure LITERAL passed as a
|
|
// function-type argument and called inside the callee. Covers a bare failable
|
|
// fn-type param (`cb: (T) -> (U, !)`), the idiomatic `Closure(...)` param
|
|
// (try-propagated), and ∅-widening of a NON-failable closure literal into a
|
|
// failable slot (the generated adapter wraps the value into `{value, 0}`).
|
|
//
|
|
// NOTE: the adapter is generated when the closure LITERAL flows directly into
|
|
// the bare-fn slot. Passing a pre-bound closure *variable* into a bare-fn slot
|
|
// is a separate coercion-site path, not yet handled — see CHECKPOINT-ERR.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Neg }
|
|
|
|
bare :: (cb: (i64) -> i64 !E, n: i64) -> i64 { return cb(n) catch (e) -1; }
|
|
chain :: (cb: Closure(i64) -> i64 !E, n: i64) -> i64 !E { return try cb(n); }
|
|
|
|
dbl :: (x: i64) -> i64 !E { if x < 0 { raise error.Neg; } return x * 2; }
|
|
|
|
main :: () -> i32 {
|
|
// failable closure literal through a bare fn-type param (matching ABI)
|
|
print("bare ok={} err={}\n",
|
|
bare(closure((x: i64) -> i64 !E { if x < 0 { raise error.Neg; } return x * 2; }), 5),
|
|
bare(closure((x: i64) -> i64 !E => x * 2), -1)); // ok=10; err: arrow never raises → cb(-1) = -2
|
|
|
|
// Closure(...) param, try-propagated, then caught at the call site
|
|
print("chain ok={} err={}\n",
|
|
chain(closure((x: i64) -> i64 !E => x + 6), 4) catch (e) 0, // 10
|
|
chain(closure((x: i64) -> i64 !E { raise error.Neg; }), 1) catch (e) 0); // 0
|
|
|
|
// NON-failable closure literal widened into the failable bare slot
|
|
print("widen={}\n", bare(closure((x: i64) -> i64 => x + 1), 9)); // 10
|
|
return 0;
|
|
}
|