Skip to content

dissolve: inline fold_list for module-root validation in 03_name_resolve (§4a residual) #4786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briansrls merged 4 commits into from
Jun 13, 2026
Merged

dissolve: inline fold_list for module-root validation in 03_name_resolve (§4a residual) #4786

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4719562
dissolve: inline fold_list for module-root validation in 03_name_reso…
Jun 12, 2026
7caec0f
Merge remote-tracking branch 'origin/main' into session/nimble-swift-44
Jun 13, 2026
55cd773
ci: interim lens budget 20→35m to unblock v4_lens_gate/ci timeouts
Jun 13, 2026
e8eed45
Merge remote-tracking branch 'origin/main' into session/nimble-swift-44
Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 63 additions & 93 deletions src/v4/compiler/03_name_resolve.dag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,76 +193,51 @@ fn module_root_name_find_fold(
}


// 🟡 gated — fold_list bootstrap-limitation interim — feature: fold-list-generic-node — hand-rolls Empty/Cons accumulation over FreeMonoid<Node>; dissolve-on-arrival: v2 bootstrap fixes FreeMonoid<T> generic type inference for user-defined T.
fn module_root_validate_fold(
roots: FreeMonoid<Node>,
acc: ModuleRootValidateState
) -> ModuleRootValidateState {
match roots {
Empty => acc
Cons { head: root, tail: rest } =>
fn validate_module_roots(roots: FreeMonoid<Node>) -> Outcome<FreeMonoid<Node>> {
match fold_list(
xs: roots,
empty: ModuleRootsValid { seen: Empty, diagnostics: None },
cons: fn(acc, root) {
match acc {
ModuleRootsDuplicate { diagnostics: d } =>
module_root_validate_fold(
roots: rest,
acc: ModuleRootsDuplicate { diagnostics: d }
)
ModuleRootsDuplicate { diagnostics: d }
ModuleRootsProjectionRejected { diagnostics: d } =>
module_root_validate_fold(
roots: rest,
acc: ModuleRootsProjectionRejected { diagnostics: d }
)
ModuleRootsProjectionRejected { diagnostics: d }
ModuleRootsValid { seen: prior, diagnostics: acc_diag } =>
if well_formed(n: root) {
match qualified_name_from_module_node(root: root) {
Rejected { diagnostics: d } =>
module_root_validate_fold(
roots: rest,
acc: ModuleRootsProjectionRejected {
diagnostics: rejected_with_pending(pending: acc_diag, rejected: d)
}
)
ModuleRootsProjectionRejected {
diagnostics: rejected_with_pending(pending: acc_diag, rejected: d)
}
Accepted { value: name, diagnostics: proj_diag } =>
let merged_diag = diagnostics_merge(outer: acc_diag, inner: proj_diag)
module_root_validate_fold(
roots: rest,
acc: match module_root_name_find_fold(
names: prior,
name: name,
acc: ModuleRootNameNotFound
) {
ModuleRootNameNotFound =>
ModuleRootsValid {
seen: Cons { head: name, tail: prior },
diagnostics: merged_diag
}
ModuleRootNameFoundOnce =>
ModuleRootsDuplicate { diagnostics: merged_diag }
ModuleRootNameFoundDuplicate =>
ModuleRootsDuplicate { diagnostics: merged_diag }
}
)
match module_root_name_find_fold(
names: prior,
name: name,
acc: ModuleRootNameNotFound
) {
ModuleRootNameNotFound =>
ModuleRootsValid {
seen: Cons { head: name, tail: prior },
diagnostics: merged_diag
}
ModuleRootNameFoundOnce =>
ModuleRootsDuplicate { diagnostics: merged_diag }
ModuleRootNameFoundDuplicate =>
ModuleRootsDuplicate { diagnostics: merged_diag }
}
}
} else {
module_root_validate_fold(
roots: rest,
acc: ModuleRootsProjectionRejected {
diagnostics: rejected_with_pending(
pending: acc_diag,
rejected: resolve_diagnostics(reason: resolve_reason_malformed_imported_root)
)
}
)
ModuleRootsProjectionRejected {
diagnostics: rejected_with_pending(
pending: acc_diag,
rejected: resolve_diagnostics(reason: resolve_reason_malformed_imported_root)
)
}
}
}
}
}


fn validate_module_roots(roots: FreeMonoid<Node>) -> Outcome<FreeMonoid<Node>> {
match module_root_validate_fold(
roots: roots,
acc: ModuleRootsValid { seen: Empty, diagnostics: None }
}
) {
ModuleRootsValid { seen: _, diagnostics: d } =>
Accepted { value: roots, diagnostics: d }
Expand All @@ -279,47 +254,42 @@ fn validate_module_roots(roots: FreeMonoid<Node>) -> Outcome<FreeMonoid<Node>> {
}


// 🟡 gated — fold_list bootstrap-limitation interim — feature: fold-list-generic-node — hand-rolls Empty/Cons accumulation over FreeMonoid<Node>; dissolve-on-arrival: v2 bootstrap fixes FreeMonoid<T> generic type inference for user-defined T.
fn module_root_for_name_fold(
fn module_root_find(
roots: FreeMonoid<Node>,
name: QualifiedName,
acc: PassingCandidateFold
) -> Outcome<PassingCandidateFold> {
match roots {
Empty => Accepted { value: acc, diagnostics: None }
Cons { head: root, tail: rest } =>
name: QualifiedName
) -> Outcome<Node> {
match fold_list(
xs: roots,
empty: Accepted { value: NoPassingCandidate, diagnostics: None },
cons: fn(acc, root) {
match acc {
ManyPassingCandidates =>
Accepted { value: ManyPassingCandidates, diagnostics: None }
_ =>
match qualified_name_from_module_node(root: root) {
Rejected { diagnostics: d } =>
Rejected { diagnostics: d }
Accepted { value: candidate, diagnostics: _ } =>
module_root_for_name_fold(
roots: rest,
name: name,
acc: if qualified_name_eq(a: candidate, b: name) {
match acc {
NoPassingCandidate => OnePassingCandidate { candidate: root }
OnePassingCandidate { candidate: _ } => ManyPassingCandidates
ManyPassingCandidates => ManyPassingCandidates
Rejected { diagnostics: d } => Rejected { diagnostics: d }
Accepted { value: fold_state, diagnostics: _ } =>
match fold_state {
ManyPassingCandidates =>
Accepted { value: ManyPassingCandidates, diagnostics: None }
_ =>
match qualified_name_from_module_node(root: root) {
Rejected { diagnostics: d } =>
Rejected { diagnostics: d }
Accepted { value: candidate, diagnostics: _ } =>
Accepted {
value: match qualified_name_eq(a: candidate, b: name) {
true =>
match fold_state {
NoPassingCandidate => OnePassingCandidate { candidate: root }
OnePassingCandidate { candidate: _ } => ManyPassingCandidates
ManyPassingCandidates => ManyPassingCandidates
}
false => fold_state
},
diagnostics: None
}
} else {
acc
}
)
}
}
}
}
}


fn module_root_find(
roots: FreeMonoid<Node>,
name: QualifiedName
) -> Outcome<Node> {
match module_root_for_name_fold(roots: roots, name: name, acc: NoPassingCandidate) {
}
) {
Rejected { diagnostics: d } => Rejected { diagnostics: d }
Accepted { value: fold_state, diagnostics: _ } =>
match fold_state {
Expand Down
Loading