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.
30 lines
1.3 KiB
Plaintext
30 lines
1.3 KiB
Plaintext
// Generic function with a value-carrying `!` return composes (ERR E5.1
|
|
// sub-feature 8). A `$T: Type` generic whose return is `(T, !E)` monomorphizes
|
|
// per call: `return try f()` propagates the closure's error, and each
|
|
// monomorphization's success value flows through as the concrete `T`.
|
|
// (Regression: confirms issue 0062 was an invalid-syntax repro — the bug only
|
|
// appeared with the non-generic `T: Type` form; the `$T` form works.)
|
|
|
|
#import "modules/std.sx";
|
|
|
|
E :: error { Bad }
|
|
|
|
wrap :: ($T: Type, f: Closure() -> T !E) -> T !E { return try f(); }
|
|
|
|
main :: () -> i32 {
|
|
// success, consumed by catch
|
|
print("catch={}\n", wrap(i32, closure(() -> i32 !E { return 7; })) catch (e) -1); // 7
|
|
|
|
// success, consumed by destructure (binds value + error slot); the value
|
|
// slot is read only under an `if !err` guard (ERR E1.8 path-sensitivity)
|
|
r, err := wrap(i32, closure(() -> i32 !E { return 9; }));
|
|
if !err { print("destr={} ok=true\n", r); } // destr=9 ok=true
|
|
|
|
// failure path: the raised tag propagates through the generic `try`
|
|
print("fail={}\n", wrap(i32, closure(() -> i32 !E { raise error.Bad; }) ) catch (e) -1); // -1
|
|
|
|
// a second monomorphization at a different T
|
|
print("u8={}\n", wrap(u8, closure(() -> u8 !E { return 200; })) catch (e) 0); // 200
|
|
return 0;
|
|
}
|