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

Refactoring

Browse Source
This commit is contained in:
Patrick Lühne 2020-04-28 02:36:02 +02:00
parent 35937d7930
commit a12acae633
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/parse/formulas.rs
View File

@ -126,29 +126,9 @@ impl<'i> FormulaStr<'i>
pub fn top_level_logical_connective(&self)
-> Result<Option<LogicalConnective>, crate::parse::Error>
{
let logical_connective = |token| match token
{
Token::Identifier(identifier) => match identifier
{
"and" => Some(LogicalConnective::And),
"or" => Some(LogicalConnective::Or),
_ => None,
},
Token::Symbol(symbol) => match symbol
{
Symbol::ArrowLeft => Some(LogicalConnective::ImpliesRightToLeft),
Symbol::ArrowLeftAndRight => Some(LogicalConnective::IfAndOnlyIf),
Symbol::ArrowRight => Some(LogicalConnective::ImpliesLeftToRight),
_ => None,
},
_ => None,
};
let logical_connectives = Tokens::new_filter_map(self.input, logical_connective);
let mut top_level_logical_connective = None;
for logical_connective in logical_connectives
for logical_connective in self.logical_connectives()
{
let (_, logical_connective) = logical_connective?;