Skip to content

ExpandExtends: Don't create an infinite loop. #108

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
Wassasin merged 1 commit into from
Apr 7, 2026
Merged

ExpandExtends: Don't create an infinite loop. #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions src/transform/expand_extends.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use anyhow::{bail, Result};
use log::*;
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
Expand All @@ -15,7 +16,7 @@ impl ExpandExtends {
.iter()
.map(|(k, v)| (k.clone(), v.extends.clone()))
.collect();
for name in topological_sort(deps) {
for name in topological_sort(deps)? {
let block = ir.blocks.get(&name).unwrap();
if let Some(parent_name) = &block.extends {
let parent = ir.blocks.get(parent_name).unwrap();
Expand All @@ -36,7 +37,7 @@ impl ExpandExtends {
.iter()
.map(|(k, v)| (k.clone(), v.extends.clone()))
.collect();
for name in topological_sort(deps) {
for name in topological_sort(deps)? {
let fieldset = ir.fieldsets.get(&name).unwrap();
if let Some(parent_name) = &fieldset.extends {
let parent = ir.fieldsets.get(parent_name).unwrap();
Expand All @@ -56,19 +57,23 @@ impl ExpandExtends {
}
}

fn topological_sort(vals: BTreeMap<String, Option<String>>) -> Vec<String> {
fn topological_sort(vals: BTreeMap<String, Option<String>>) -> Result<Vec<String>> {
for (name, dep) in &vals {
info!("{:?} => {:?}", name, dep);
info!("{:?} → {:?}", name, dep);
}

let mut done = BTreeSet::new();
let mut res = Vec::new();

while done.len() != vals.len() {
for (name, dep) in &vals {
if done.contains(name) {
continue;
}
if let Some(dep) = dep {
if !vals.contains_key(dep) {
bail!("Couldn't resolve dependency for {name} → {dep}");
}
if !done.contains(dep) {
continue;
}
Expand All @@ -78,5 +83,6 @@ fn topological_sort(vals: BTreeMap<String, Option<String>>) -> Vec<String> {
res.push(name.clone());
}
}
res

Ok(res)
}