39c21468ee
All occurrences of Closure(<sig>) -> (T, !) with a structurally identical value-signature now share one inferred error-set node; every bare-! closure literal of that shape unions its escape tags in, and a `try slot(x)` against any matching-shape slot widens the caller's named set against that union. This closes the gap where a slot call (no static function name) skipped the widening check entirely. - shape_inferred_sets keyed by closureShapeKey (params + value-return via mangleTypeName, error slot excluded) so bare-!, non-failable, .function and .closure of one value-sig collapse to a single key. - convergeClosureShapeSets pre-pass (lowerRoot Pass 1d', after the name-keyed convergeInferredErrorSets): collectClosureShapes walks fn bodies through lambda boundaries; recordClosureShape resolves each concrete bare-! literal's shape and unions its raises (+ try named_fn() edges via calleeEscapeTags) into the shape node. - checkEscapeWidening falls back to shapeKeyOfCallee for bare-! slot calls (computed from the callee expr's .function/.closure type). Empty union is silently allowed (sub-feature 6). Scope: concrete shapes only (generic lambdas skipped); closure-to-closure try edges are not fix-pointed (under-approximation = a missed diagnostic, never a miscompile). Tests: 1041 (positive — union composes, runs), 1042 (reject — two widening diagnostics, exit 1).
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(s32)->(s32,!)` 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(s32) -> (s32, !), x: s32) -> (s32, !Small) {
|
|
return try h(x); // Negative, Other ∉ Small → two diagnostics
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
gpa := GPA.init();
|
|
push Context.{ allocator = xx gpa } {
|
|
handlers : List(Closure(s32) -> (s32, !)) = .{};
|
|
handlers.append(closure((x: s32) -> (s32, !) { if x < 0 { raise error.Negative; } return x; }));
|
|
handlers.append(closure((x: s32) -> (s32, !) { if x == 0 { raise error.Other; } return x; }));
|
|
print("r={}\n", reject(handlers.items[0], 5) catch e 0);
|
|
}
|
|
return 0;
|
|
}
|