diff --git a/src/lib.rs b/src/lib.rs index 0c0845f..d6a1413 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,4 +12,4 @@ mod utils; pub use error::Error; pub use problem::Problem; pub(crate) use utils::*; -pub use utils::{Domain, InputConstantDeclarationDomains}; +pub use utils::Domain; diff --git a/src/problem.rs b/src/problem.rs index 91c4419..40a1dc9 100644 --- a/src/problem.rs +++ b/src/problem.rs @@ -43,11 +43,14 @@ pub struct Statement type VariableDeclarationIDs = std::collections::BTreeMap::, usize>; +type InputConstantDeclarationDomains + = std::collections::BTreeMap, crate::Domain>; + struct FormatContext<'a, 'b> { pub program_variable_declaration_ids: std::cell::RefCell, pub integer_variable_declaration_ids: std::cell::RefCell, - pub input_constant_declaration_domains: &'a crate::InputConstantDeclarationDomains, + pub input_constant_declaration_domains: &'a InputConstantDeclarationDomains, pub variable_declaration_domains: &'b VariableDeclarationDomains, } @@ -89,8 +92,7 @@ pub struct Problem statements: std::cell::RefCell>>, pub input_constant_declarations: std::cell::RefCell, - pub input_constant_declaration_domains: - std::cell::RefCell, + pub input_constant_declaration_domains: std::cell::RefCell, pub input_predicate_declarations: std::cell::RefCell, // TODO: clean up as variable declarations are dropped variable_declaration_domains: std::cell::RefCell, @@ -110,7 +112,7 @@ impl Problem input_constant_declarations: std::cell::RefCell::new(foliage::FunctionDeclarations::new()), input_constant_declaration_domains: - std::cell::RefCell::new(crate::InputConstantDeclarationDomains::new()), + std::cell::RefCell::new(InputConstantDeclarationDomains::new()), input_predicate_declarations: std::cell::RefCell::new(foliage::PredicateDeclarations::new()), variable_declaration_domains: diff --git a/src/utils.rs b/src/utils.rs index 1d73d33..7427ed0 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -43,6 +43,3 @@ pub(crate) struct ScopedFormula pub free_variable_declarations: std::rc::Rc, pub formula: foliage::Formula, } - -pub type InputConstantDeclarationDomains - = std::collections::BTreeMap, Domain>;