patrick/anthem-rs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix supertightness check

Browse Source
This commit is contained in:
Patrick Lühne 2020-05-28 18:37:34 +02:00
parent b52ca236e2
commit e57a1859d2
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ast.rs
View File

@ -109,7 +109,7 @@ impl PredicateDeclaration
*self.is_input.borrow() || *self.is_output.borrow() *self.is_input.borrow() || *self.is_output.borrow()
} }
fn collect_transitive_dependencies(&self, fn collect_transitive_private_dependencies(&self,
mut transitive_dependencies: &mut std::collections::BTreeSet< mut transitive_dependencies: &mut std::collections::BTreeSet<
std::rc::Rc<crate::PredicateDeclaration>>) std::rc::Rc<crate::PredicateDeclaration>>)
{ {
@ -124,22 +124,27 @@ impl PredicateDeclaration
for dependency in dependencies.iter() for dependency in dependencies.iter()
{ {
if transitive_dependencies.contains(&*dependency) if transitive_dependencies.contains(&*dependency)
|| dependency.is_public()
|| dependency.is_built_in()
{ {
continue; continue;
} }
transitive_dependencies.insert(std::rc::Rc::clone(&dependency)); transitive_dependencies.insert(std::rc::Rc::clone(&dependency));
dependency.collect_transitive_dependencies(&mut transitive_dependencies); dependency.collect_transitive_private_dependencies(&mut transitive_dependencies);
} }
} }
pub fn is_self_referential(&self) -> bool pub fn has_private_dependency_cycle(&self) -> bool
{ {
let mut transitive_dependencies = std::collections::BTreeSet::new(); if self.is_public() || self.is_built_in()
self.collect_transitive_dependencies(&mut transitive_dependencies); {
return false;
}
log::debug!("{} depends on {:?}", self.declaration, transitive_dependencies.iter().map(|x| &x.declaration).collect::<Vec<_>>()); let mut transitive_dependencies = std::collections::BTreeSet::new();
self.collect_transitive_private_dependencies(&mut transitive_dependencies);
transitive_dependencies.contains(self) transitive_dependencies.contains(self)
} }

4
src/problem.rs
View File

@ -68,8 +68,8 @@ impl Problem
// If a backward proof is necessary, the program needs to be supertight, that is, no // If a backward proof is necessary, the program needs to be supertight, that is, no
// private predicates may transitively depend on themselves // private predicates may transitively depend on themselves
if proof_direction.requires_backward_proof() && !predicate_declaration.is_public() if proof_direction.requires_backward_proof()
&& predicate_declaration.is_self_referential() && predicate_declaration.has_private_dependency_cycle()
{ {
return Err(crate::Error::new_private_predicate_cycle( return Err(crate::Error::new_private_predicate_cycle(
std::rc::Rc::clone(&predicate_declaration))); std::rc::Rc::clone(&predicate_declaration)));