M-Labs/nac3
M-Labs/nac3
8
1
Fork 12
Code Issues 98 Pull Requests 19 Releases Wiki Activity

nac3core/typecheck: fixed incorrect rollback

Browse Source
This commit is contained in:
pca006132 2022-02-25 20:01:11 +08:00
parent e710b6c320
commit 0686e83f4c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nac3core/src/typecheck/typedef/mod.rs
View File

@ -427,6 +427,7 @@ impl Unifier {
let mut all_names: Vec<_> = signature.args.iter().map(|v| (v.name, v.ty)).rev().collect(); let mut all_names: Vec<_> = signature.args.iter().map(|v| (v.name, v.ty)).rev().collect();
for (i, t) in posargs.iter().enumerate() { for (i, t) in posargs.iter().enumerate() {
if signature.args.len() <= i { if signature.args.len() <= i {
self.restore_snapshot();
return Err(TypeError::new( return Err(TypeError::new(
TypeErrorKind::TooManyArguments { expected: signature.args.len(), got: i }, TypeErrorKind::TooManyArguments { expected: signature.args.len(), got: i },
*loc, *loc,
@ -483,6 +484,7 @@ impl Unifier {
} }
self.unify_cache.clear(); self.unify_cache.clear();
if self.unification_table.unioned(a, b) { if self.unification_table.unioned(a, b) {
self.discard_snapshot(snapshot);
Ok(()) Ok(())
} else { } else {
let result = self.unify_impl(a, b, false); let result = self.unify_impl(a, b, false);

1
nac3core/src/typecheck/unification_table.rs
View File

@ -61,6 +61,7 @@ impl<V> UnificationTable<V> {
if self.ranks[a] < self.ranks[b] { if self.ranks[a] < self.ranks[b] {
std::mem::swap(&mut a, &mut b); std::mem::swap(&mut a, &mut b);
} }
self.log.push(Action::Parent { key: b, original_parent: a });
self.parents[b] = a; self.parents[b] = a;
if self.ranks[a] == self.ranks[b] { if self.ranks[a] == self.ranks[b] {
self.log.push(Action::Rank { key: a, original_rank: self.ranks[a] }); self.log.push(Action::Rank { key: a, original_rank: self.ranks[a] });