language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 08:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

populate the matrix

Browse source
This commit is contained in:
Folkert 2022-04-23 23:52:49 +02:00
parent 5c992e49d9
commit a556cccb1e
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/can/src/def.rs
View file

@ -1907,24 +1907,29 @@ fn correct_mutual_recursive_type_alias<'a>(
) -> ImMap<Symbol, Alias> { ) -> ImMap<Symbol, Alias> {
let symbols_introduced: Vec<Symbol> = original_aliases.keys().copied().collect(); let symbols_introduced: Vec<Symbol> = original_aliases.keys().copied().collect();
let all_successors_with_self = |symbol: &Symbol| -> Vec<Symbol> { let mut matrix = ReferenceMatrix::new(original_aliases.len());
match original_aliases.get(symbol) {
Some(alias) => {
let mut loc_succ = alias.typ.symbols();
// remove anything that is not defined in the current block
loc_succ.retain(|key| symbols_introduced.contains(key));
loc_succ for (index, (_, alias)) in original_aliases.iter().enumerate() {
for referenced in alias.typ.symbols() {
match symbols_introduced.iter().position(|k| referenced == *k) {
None => { /* ignore */ }
Some(ref_id) => matrix.set_row_col(index, ref_id, true),
} }
}
}
let all_successors_with_self = |symbol: &Symbol| -> Vec<Symbol> {
match symbols_introduced.iter().position(|k| symbol == k) {
Some(index) => matrix
.references_for(index)
.map(|r| symbols_introduced[r])
.collect(),
None => vec![], None => vec![],
} }
}; };
// TODO investigate should this be in a loop?
let defined_symbols: Vec<Symbol> = original_aliases.keys().copied().collect();
let cycles = let cycles =
ven_graph::strongly_connected_components(&defined_symbols, all_successors_with_self); ven_graph::strongly_connected_components(&symbols_introduced, all_successors_with_self);
let mut solved_aliases = ImMap::default(); let mut solved_aliases = ImMap::default();
for cycle in cycles { for cycle in cycles {