diff --git a/src/ast.rs b/src/ast.rs index 385932a..c7320bf 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -556,7 +556,7 @@ impl Formula } } -pub struct ClosedFormula +pub struct OpenFormula { pub free_variable_declarations: std::rc::Rc, pub formula: Formula, diff --git a/src/parse/formulas.rs b/src/parse/formulas.rs index 13e03da..78e68cd 100644 --- a/src/parse/formulas.rs +++ b/src/parse/formulas.rs @@ -1,8 +1,7 @@ use super::terms::*; use super::tokens::*; -pub fn formula(input: &str, declarations: &D) - -> Result +pub fn formula(input: &str, declarations: &D) -> Result where D: crate::FindOrCreateFunctionDeclaration + crate::FindOrCreatePredicateDeclaration, { @@ -18,7 +17,7 @@ where _ => unreachable!(), }; - Ok(crate::ClosedFormula + Ok(crate::OpenFormula { formula, free_variable_declarations,