eb7636d0f3
A qualified generic type head `ns.Box(args)` was stripped to its bare name and
read from the last-wins `struct_template_map`, so the namespace qualifier never
selected the template author: `a.Box(s64)` and `b.Box(s64)` (two namespaces each
authoring a same-name `Box($T)` with different layouts) both instantiated the
global same-name template. The documented ambiguity escape hatch ("qualify it as
ns.Box") silently produced the wrong layout.
Select the template via the namespace edge (importer -> alias -> NamespaceTarget)
instead of the bare map, at both the .call and parameterized-type-expr head
sites. Two same-name templates instantiated with the same args would also collide
on the mangled name `Box__s64`, so tag the non-canonical author's mangled name
with its source (the canonical bare-map author keeps the untagged name -> no
churn for single-author generics).
Extract `buildGenericStructTemplate` so the bare registration and the new
namespace-qualified selection share one template builder.
Regression: examples/0772 — two namespaces each authoring Box($T) with different
layouts; ns_a.Box(s64) and ns_b.Box(s64) resolve to their own module's template
(sizes 8 and 16). Fail-before on 566de96 (a=16 b=16), pass-after (a=8 b=16).
30 lines
1.4 KiB
Plaintext
30 lines
1.4 KiB
Plaintext
// A qualified generic type head `ns.Box(args)` must instantiate the template
|
|
// AUTHORED by `ns`'s module — not the global same-name template that happened to
|
|
// win the last-wins `struct_template_map`. `main` imports two namespaces that
|
|
// each author a same-name generic `Box($T)` with a DIFFERENT layout (a: one
|
|
// field, b: two fields). `a.Box(s64)` and `b.Box(s64)` must resolve to their OWN
|
|
// module's template (sizes 8 and 16) and be DISTINCT types, so a field unique to
|
|
// b's layout (`y`) is reachable only through `b.Box`.
|
|
//
|
|
// This is the ambiguity escape hatch made real: when a bare `Box(s64)` is
|
|
// ambiguous (two flat same-name authors), the diagnostic tells the user to
|
|
// "qualify the reference"; that advice only works if `ns.Box(..)` actually
|
|
// selects ns's author.
|
|
//
|
|
// Regression (Phase E4): before qualified generic-head selection, the head was
|
|
// stripped to the bare name and read from the global `struct_template_map`, so
|
|
// `a.Box(s64)` and `b.Box(s64)` both instantiated the last-wins template (both
|
|
// size 16) — the namespace qualifier was ignored.
|
|
|
|
#import "modules/std.sx";
|
|
a :: #import "0772-modules-qualified-generic-head-author/a.sx";
|
|
b :: #import "0772-modules-qualified-generic-head-author/b.sx";
|
|
|
|
main :: () -> s32 {
|
|
pa : a.Box(s64) = .{ x = 1 };
|
|
pb : b.Box(s64) = .{ x = 10, y = 20 };
|
|
print("a={} b={}\n", size_of(a.Box(s64)), size_of(b.Box(s64)));
|
|
print("pa.x={} pb.x={} pb.y={}\n", pa.x, pb.x, pb.y);
|
|
0
|
|
}
|