mirror of
https://github.com/HigherOrderCO/Bend.git
synced 2024-09-17 14:47:21 +03:00
Merge pull request #278 from HigherOrderCO/bug/sc-654/with-clauses-in-match-are-moving-let-and
[sc-654] Fix linearize binds before match
This commit is contained in:
commit
bd6b4c129a
@ -209,7 +209,9 @@ fn fixed_and_linearized_terms(used_in_arg: HashSet<Name>, bind_terms: Vec<Term>)
|
||||
|
||||
/// Get which binds are fixed because they are in the dependency graph
|
||||
/// of a free var or of a var used in the match arg.
|
||||
fn binds_fixed_by_dependency(mut fixed_binds: HashSet<Name>, bind_terms: &[Term]) -> HashSet<Name> {
|
||||
fn binds_fixed_by_dependency(used_in_arg: HashSet<Name>, bind_terms: &[Term]) -> HashSet<Name> {
|
||||
let mut fixed_binds = used_in_arg;
|
||||
|
||||
// Find the use dependencies of each bind
|
||||
let mut binds = vec![];
|
||||
let mut dependency_digraph = HashMap::new();
|
||||
@ -275,7 +277,42 @@ fn binds_fixed_by_dependency(mut fixed_binds: HashSet<Name>, bind_terms: &[Term]
|
||||
to_visit.extend(deps);
|
||||
}
|
||||
}
|
||||
used_component
|
||||
|
||||
// Mark lambdas that come before a fixed lambda as also fixed
|
||||
let mut fixed_start = false;
|
||||
let mut fixed_lams = HashSet::new();
|
||||
for term in bind_terms.iter().rev() {
|
||||
if let Term::Lam { pat, .. } = term {
|
||||
if pat.binds().flatten().any(|p| used_component.contains(p)) {
|
||||
fixed_start = true;
|
||||
}
|
||||
if fixed_start {
|
||||
for bind in pat.binds().flatten() {
|
||||
fixed_lams.insert(bind.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut fixed_binds = used_component;
|
||||
|
||||
// Mark binds that depend on fixed lambdas as also fixed.
|
||||
let mut visited = HashSet::new();
|
||||
let mut to_visit = fixed_lams.iter().collect::<Vec<_>>();
|
||||
while let Some(node) = to_visit.pop() {
|
||||
if visited.contains(node) {
|
||||
continue;
|
||||
}
|
||||
fixed_binds.insert(node.clone());
|
||||
visited.insert(node);
|
||||
|
||||
// Add these dependencies to be checked (if it's not a free var in the match arg)
|
||||
if let Some(deps) = dependency_graph.get(node) {
|
||||
to_visit.extend(deps);
|
||||
}
|
||||
}
|
||||
|
||||
fixed_binds
|
||||
}
|
||||
|
||||
/* Linearize all used vars */
|
||||
|
11
tests/golden_tests/simplify_matches/complex_with_case.hvm
Normal file
11
tests/golden_tests/simplify_matches/complex_with_case.hvm
Normal file
@ -0,0 +1,11 @@
|
||||
data Tree = (Node lt rt rd ld) | (Leaf val)
|
||||
|
||||
(map) =
|
||||
λarg1 λarg2 use tree = arg2;
|
||||
use f = arg1;
|
||||
match tree with f {
|
||||
Node: (Node (map f tree.lt) (map f tree.rt) (map f tree.rd) (map f tree.ld));
|
||||
Leaf: (Leaf (f tree.val));
|
||||
}
|
||||
|
||||
main = map
|
11
tests/snapshots/simplify_matches__complex_with_case.hvm.snap
Normal file
11
tests/snapshots/simplify_matches__complex_with_case.hvm.snap
Normal file
@ -0,0 +1,11 @@
|
||||
---
|
||||
source: tests/golden_tests.rs
|
||||
input_file: tests/golden_tests/simplify_matches/complex_with_case.hvm
|
||||
---
|
||||
(map) = λa λb (match b { Node c d e f: λg (Node (map g c) (map g d) (map g e) (map g f)); Leaf h: λi (Leaf (i h)); } a)
|
||||
|
||||
(main) = map
|
||||
|
||||
(Node) = λa λb λc λd λe λf (e a b c d)
|
||||
|
||||
(Leaf) = λa λb λc (c a)
|
Loading…
Reference in New Issue
Block a user