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

Remove unneeded trait methods

Browse Source
This commit is contained in:
Patrick Lühne 2020-07-07 09:56:14 +02:00
parent c6f2cdc6e1
commit 79d6643598
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/parse.rs
View File

@ -11,17 +11,15 @@ pub trait Parser: Sized
{ {
type Flavor: crate::flavor::Flavor; type Flavor: crate::flavor::Flavor;
fn new_function_declaration(name: String, arity: usize) fn find_or_create_function_declaration(&self, name: &str, arity: usize)
-> <Self::Flavor as crate::flavor::Flavor>::FunctionDeclaration; -> std::rc::Rc<<Self::Flavor as crate::flavor::Flavor>::FunctionDeclaration>;
fn new_predicate_declaration(name: String, arity: usize)
-> <Self::Flavor as crate::flavor::Flavor>::PredicateDeclaration; fn find_or_create_predicate_declaration(&self, name: &str, arity: usize)
-> std::rc::Rc<<Self::Flavor as crate::flavor::Flavor>::PredicateDeclaration>;
fn new_variable_declaration(name: String) fn new_variable_declaration(name: String)
-> <Self::Flavor as crate::flavor::Flavor>::VariableDeclaration; -> <Self::Flavor as crate::flavor::Flavor>::VariableDeclaration;
fn find_or_create_function_declaration(&self, name: &str, arity: usize)
-> std::rc::Rc<<Self::Flavor as crate::flavor::Flavor>::FunctionDeclaration>;
fn find_or_create_predicate_declaration(&self, name: &str, arity: usize)
-> std::rc::Rc<<Self::Flavor as crate::flavor::Flavor>::PredicateDeclaration>;
fn find_or_create_variable_declaration( fn find_or_create_variable_declaration(
variable_declaration_stack_layer: &crate::VariableDeclarationStackLayer<Self::Flavor>, variable_declaration_stack_layer: &crate::VariableDeclarationStackLayer<Self::Flavor>,
variable_name: &str) variable_name: &str)
@ -93,26 +91,6 @@ impl Parser for DefaultParser
{ {
type Flavor = crate::flavor::DefaultFlavor; type Flavor = crate::flavor::DefaultFlavor;
fn new_function_declaration(name: String, arity: usize)
-> <Self::Flavor as crate::flavor::Flavor>::FunctionDeclaration
{
crate::FunctionDeclaration
{
name,
arity,
}
}
fn new_predicate_declaration(name: String, arity: usize)
-> <Self::Flavor as crate::flavor::Flavor>::PredicateDeclaration
{
crate::PredicateDeclaration
{
name,
arity,
}
}
fn new_variable_declaration(name: String) fn new_variable_declaration(name: String)
-> <Self::Flavor as crate::flavor::Flavor>::VariableDeclaration -> <Self::Flavor as crate::flavor::Flavor>::VariableDeclaration
{ {
@ -132,7 +110,7 @@ impl Parser for DefaultParser
Some(declaration) => std::rc::Rc::clone(&declaration), Some(declaration) => std::rc::Rc::clone(&declaration),
None => None =>
{ {
let declaration = Self::new_function_declaration(name.to_string(), arity); let declaration = crate::FunctionDeclaration::new(name.to_string(), arity);
let declaration = std::rc::Rc::new(declaration); let declaration = std::rc::Rc::new(declaration);
function_declarations.insert(std::rc::Rc::clone(&declaration)); function_declarations.insert(std::rc::Rc::clone(&declaration));
@ -152,7 +130,7 @@ impl Parser for DefaultParser
Some(declaration) => std::rc::Rc::clone(&declaration), Some(declaration) => std::rc::Rc::clone(&declaration),
None => None =>
{ {
let declaration = Self::new_predicate_declaration(name.to_string(), arity); let declaration = crate::PredicateDeclaration::new(name.to_string(), arity);
let declaration = std::rc::Rc::new(declaration); let declaration = std::rc::Rc::new(declaration);
predicate_declarations.insert(std::rc::Rc::clone(&declaration)); predicate_declarations.insert(std::rc::Rc::clone(&declaration));