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.
26 lines
1.1 KiB
Plaintext
26 lines
1.1 KiB
Plaintext
// Program-wide closure-shape union — widening REJECTION (ERR E5.1 sub-feature 2).
|
|
// Two closure literals of shape `Closure(i32)->(i32,!)` raise `Negative` /
|
|
// `Other`; the shared inferred-`!` node for that shape is { Negative, Other }.
|
|
// A caller that `try`s a slot of this shape but declares only `!Small` (which
|
|
// omits both tags) is rejected — the union is checked against the caller's set
|
|
// even though the call goes through a slot with no static function name.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
Small :: error { Unrelated }
|
|
|
|
reject :: (h: Closure(i32) -> i32 !, x: i32) -> i32 !Small {
|
|
return try h(x); // Negative, Other ∉ Small → two diagnostics
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
gpa := GPA.init();
|
|
push Context.{ allocator = xx gpa } {
|
|
handlers : List(Closure(i32) -> i32 !) = .{};
|
|
handlers.append(closure((x: i32) -> i32 ! { if x < 0 { raise error.Negative; } return x; }));
|
|
handlers.append(closure((x: i32) -> i32 ! { if x == 0 { raise error.Other; } return x; }));
|
|
print("r={}\n", reject(handlers.items[0], 5) catch (e) 0);
|
|
}
|
|
return 0;
|
|
}
|