Working on #48 : Refactored FunctionParser, introducting ExpressionParser

src/parsers/LogicalOperatorParser.py

@@ -7,7 +7,7 @@ from core.sheerka.services.sheerka_service import FailedToCompileError
 from core.tokenizer import TokenKind, Tokenizer, Keywords
 from core.utils import get_text_from_tokens
 from parsers.BaseNodeParser import UnrecognizedTokensNode
-from parsers.BaseParser import BaseParser, UnexpectedTokenParsingError, UnexpectedEofParsingError
+from parsers.BaseParser import BaseParser, UnexpectedTokenParsingError, UnexpectedEofParsingError, BaseExprParser
 from parsers.PythonWithConceptsParser import PythonWithConceptsParser
 from parsers.expressions import ParenthesisNode, OrNode, AndNode, NotNode, LeftPartNotFoundError, \
     ParenthesisMismatchError, NameExprNode, ExprNode, VariableNode, ComparisonNode
@@ -60,7 +60,7 @@ class ReteConditionsEmitter:
         return [AndConditions(conditions)]
 
 
-class LogicalOperatorParser(BaseParser):
+class LogicalOperatorParser(BaseExprParser):
     """
     will parser logic expression
     like not (a and b or c)
@@ -93,7 +93,7 @@ class LogicalOperatorParser(BaseParser):
         if not isinstance(parser_input, ParserInput):
             return None
 
-        context.log(f"Parsing '{parser_input}' with LogicalOperatorParser", self.name)
+        context.log(f"Parsing '{parser_input}' with {self.NAME}Parser", self.name)
         sheerka = context.sheerka
 
         if parser_input.is_empty():
@@ -108,7 +108,7 @@ class LogicalOperatorParser(BaseParser):
                 context.sheerka.new(BuiltinConcepts.ERROR, body=self.error_sink))
 
         self.parser_input.next_token()
-        tree = self.parse_or()
+        tree = self.parse_input()
         token = self.parser_input.token
         if token and token.type != TokenKind.EOF:
             self.add_error(UnexpectedTokenParsingError(f"Unexpected token '{token}'", token, []))
@@ -124,6 +124,9 @@ class LogicalOperatorParser(BaseParser):
 
         return ret
 
+    def parse_input(self):
+        return self.parse_or()
+
     def parse_or(self):
         start = self.parser_input.pos
         expr = self.parse_and()