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

Remove unneeded indirection

Browse Source
This commit is contained in:
Patrick Lühne 2020-04-17 03:37:53 +02:00
parent eb60bd7520
commit e6cf79ad1e
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/translate/verify_properties.rs
View File

@ -134,7 +134,7 @@ where
let scoped_formula = crate::ScopedFormula let scoped_formula = crate::ScopedFormula
{ {
free_variable_declarations: definitions.head_atom_parameters, free_variable_declarations: definitions.head_atom_parameters,
formula: Box::new(completed_definition), formula: completed_definition,
}; };
crate::universal_closure(scoped_formula) crate::universal_closure(scoped_formula)
@ -165,7 +165,7 @@ where
let scoped_formula = crate::ScopedFormula let scoped_formula = crate::ScopedFormula
{ {
free_variable_declarations: head_atom_parameters, free_variable_declarations: head_atom_parameters,
formula: Box::new(not), formula: not,
}; };
crate::universal_closure(scoped_formula) crate::universal_closure(scoped_formula)
@ -420,7 +420,7 @@ fn read_rule(rule: &clingo::ast::Rule, context: &Context) -> Result<(), crate::E
let definition = crate::ScopedFormula let definition = crate::ScopedFormula
{ {
free_variable_declarations: std::rc::Rc::new(free_variable_declarations), free_variable_declarations: std::rc::Rc::new(free_variable_declarations),
formula: Box::new(definition), formula: definition,
}; };
log::debug!("translated rule with single atom in head: {}", log::debug!("translated rule with single atom in head: {}",
@ -454,7 +454,7 @@ fn read_rule(rule: &clingo::ast::Rule, context: &Context) -> Result<(), crate::E
let scoped_formula = crate::ScopedFormula let scoped_formula = crate::ScopedFormula
{ {
free_variable_declarations: std::rc::Rc::new(free_variable_declarations), free_variable_declarations: std::rc::Rc::new(free_variable_declarations),
formula: Box::new(formula), formula,
}; };
let integrity_constraint = crate::universal_closure(scoped_formula); let integrity_constraint = crate::universal_closure(scoped_formula);

10
src/utils.rs
View File

@ -39,16 +39,16 @@ impl std::fmt::Display for Domain
pub(crate) struct ScopedFormula pub(crate) struct ScopedFormula
{ {
pub free_variable_declarations: std::rc::Rc<foliage::VariableDeclarations>, pub free_variable_declarations: std::rc::Rc<foliage::VariableDeclarations>,
pub formula: Box<foliage::Formula>, pub formula: foliage::Formula,
} }
pub(crate) fn existential_closure(scoped_formula: crate::ScopedFormula) -> foliage::Formula pub(crate) fn existential_closure(scoped_formula: crate::ScopedFormula) -> foliage::Formula
{ {
match scoped_formula.free_variable_declarations.is_empty() match scoped_formula.free_variable_declarations.is_empty()
{ {
true => *scoped_formula.formula, true => scoped_formula.formula,
false => foliage::Formula::exists(scoped_formula.free_variable_declarations, false => foliage::Formula::exists(scoped_formula.free_variable_declarations,
scoped_formula.formula), Box::new(scoped_formula.formula)),
} }
} }
@ -56,9 +56,9 @@ pub(crate) fn universal_closure(scoped_formula: crate::ScopedFormula) -> foliage
{ {
match scoped_formula.free_variable_declarations.is_empty() match scoped_formula.free_variable_declarations.is_empty()
{ {
true => *scoped_formula.formula, true => scoped_formula.formula,
false => foliage::Formula::for_all(scoped_formula.free_variable_declarations, false => foliage::Formula::for_all(scoped_formula.free_variable_declarations,
scoped_formula.formula), Box::new(scoped_formula.formula)),
} }
} }