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

refactor

Browse source
This commit is contained in:
Folkert 2022-04-22 19:32:47 +02:00
parent 18ba49c694
commit fdd0910ba0
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/can/src/reference_matrix.rs
View file

@ -51,17 +51,14 @@ impl ReferenceMatrix {
// Thank you, Samuel! // Thank you, Samuel!
impl ReferenceMatrix { impl ReferenceMatrix {
pub fn topological_sort_into_groups(&self) -> TopologicalSort { pub fn topological_sort_into_groups(&self) -> TopologicalSort {
let length = self.length; if self.length == 0 {
let bitvec = &self.bitvec;
if length == 0 {
return TopologicalSort::Groups { groups: Vec::new() }; return TopologicalSort::Groups { groups: Vec::new() };
} }
let mut preds_map: Vec<i64> = vec![0; length]; let mut preds_map: Vec<i64> = vec![0; self.length];
// this is basically summing the columns, I don't see a better way to do it // this is basically summing the columns, I don't see a better way to do it
for row in bitvec.chunks(length) { for row in self.bitvec.chunks(self.length) {
for succ in row.iter_ones() { for succ in row.iter_ones() {
preds_map[succ] += 1; preds_map[succ] += 1;
} }
@ -83,7 +80,7 @@ impl ReferenceMatrix {
.collect(); .collect();
if prev_group.is_empty() { if prev_group.is_empty() {
let remaining: Vec<u32> = (0u32..length as u32).collect(); let remaining: Vec<u32> = (0u32..self.length as u32).collect();
return TopologicalSort::HasCycles { return TopologicalSort::HasCycles {
groups: Vec::new(), groups: Vec::new(),
@ -94,8 +91,7 @@ impl ReferenceMatrix {
while preds_map.iter().any(|x| *x > 0) { while preds_map.iter().any(|x| *x > 0) {
let mut next_group = Vec::<u32>::new(); let mut next_group = Vec::<u32>::new();
for node in &prev_group { for node in &prev_group {
let row = &bitvec[length * (*node as usize)..][..length]; for succ in self.references_for(*node as usize) {
for succ in row.iter_ones() {
{ {
let num_preds = preds_map.get_mut(succ).unwrap(); let num_preds = preds_map.get_mut(succ).unwrap();
*num_preds = num_preds.saturating_sub(1); *num_preds = num_preds.saturating_sub(1);
@ -116,7 +112,7 @@ impl ReferenceMatrix {
} }
groups.push(std::mem::replace(&mut prev_group, next_group)); groups.push(std::mem::replace(&mut prev_group, next_group));
if prev_group.is_empty() { if prev_group.is_empty() {
let remaining: Vec<u32> = (0u32..length as u32) let remaining: Vec<u32> = (0u32..self.length as u32)
.filter(|i| preds_map[*i as usize] > 0) .filter(|i| preds_map[*i as usize] > 0)
.collect(); .collect();