From a12acae633fc3f8c1e51f77e60d2dfeab24b2d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick@luehne.de>
Date: Tue, 28 Apr 2020 02:36:02 +0200
Subject: [PATCH] Refactoring

---
 src/parse/formulas.rs | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/parse/formulas.rs b/src/parse/formulas.rs
index e8803a2..53012a9 100644
--- a/src/parse/formulas.rs
+++ b/src/parse/formulas.rs
@@ -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?;