lab/sx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(R1): own const_decl pending alias wins over flat imports (issue 0107)

Browse Source 
When a module declares `A :: B; B :: u64;` and both a flat import and a
namespaced import export `B :: u8`, the flat import's B was discovered by
flatTypeAuthorCount before the own B :: u64 was processed — binding A to
u8 and silently truncating values.

Fix: ownConstDeclIsPendingAlias guard added to selectNominalLeaf between
the own-alias check and the flat-import walk. If the querying module has
an own const_decl for the name that is not yet in type_aliases_by_source,
return .pending so the forward-alias fixpoint resolves it correctly.

Regression: examples/0830-modules-flat-ns-same-name-forward-alias.sx
(x : A = 300 prints 300, not 44). 541/541 tests pass.
This commit is contained in:
agra
2026-06-09 22:16:47 +03:00
parent 5ed54a08ee
commit 010e644897
8 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ir/lower.zig
View File

@@ -2044,6 +2044,12 @@ pub const Lowering = struct {
return .forward;
},
};
// Own-wins before flat: if this module has an own `const_decl` for
// `name` that is not yet in `type_aliases_by_source`, it is a forward
// type alias pending the fixpoint. Deferring here prevents a flat-import's
// same-name type alias from winning before the own declaration is processed
// (issue 0107: flat `B :: u8` would preempt the own `B :: u64`).
if (self.ownConstDeclIsPendingAlias(from, name)) return .pending;
switch (self.flatTypeAuthorCount(name, from)) {
.none => {},
.one => |tid| return .{ .resolved = tid },
@@ -2151,6 +2157,20 @@ pub const Lowering = struct {
/// `module_consts_by_source`, never `type_aliases_by_source`, so it returns
/// null too. THE per-module "is `name` a type author here?" predicate — the
/// single source of truth for the visibility walk (R4).
/// True when `from` declares `name` as a `const_decl` that is NOT yet
/// registered in `type_aliases_by_source` — an unprocessed forward type alias
/// whose own-module resolution should take precedence over flat imports.
fn ownConstDeclIsPendingAlias(self: *Lowering, from: []const u8, name: []const u8) bool {
const decls = self.program_index.module_decls orelse return false;
const m = decls.get(from) orelse return false;
const ref = m.names.get(name) orelse return false;
if (std.meta.activeTag(ref) != .const_decl) return false;
if (self.program_index.type_aliases_by_source.get(from)) |inner| {
if (inner.contains(name)) return false;
}
return true;
}
fn moduleTypeAuthor(self: *Lowering, path: []const u8, name: []const u8) ?FlatTypeAuthor {
if (self.program_index.type_aliases_by_source.get(path)) |inner| {
if (inner.get(name)) |tid| return .{ .alias = tid };