Working on #48 : Updating ExpressionParser.py

2021-03-11 11:50:23 +01:00
parent aa42bcb2ec
commit 8f51893f53
4 changed files with 23 additions and 7 deletions
@@ -20,8 +20,8 @@ class ExpressionParser(BaseExprParser):
        super().__init__(ExpressionParser.NAME, 60, False, yield_eof=False)
        self.variable_parser = VariableOrNamesParser()
        self.function_parser = FunctionParser()
-        self.relational_parser = RelationalOperatorParser()
-        self.logical_parser = LogicalOperatorParser(expr_parser=self.variable_parser)
+        self.relational_parser = RelationalOperatorParser(expr_parser=self.variable_parser)
+        self.logical_parser = LogicalOperatorParser(expr_parser=self.relational_parser)

    def parse(self, context, parser_input: ParserInput):
        """
@@ -64,6 +64,7 @@ class ExpressionParser(BaseExprParser):
    def parse_input(self, context, parser_input, error_sink):
        pos = parser_input.pos
        for parser in [self.logical_parser,
+                       self.relational_parser,
                       self.variable_parser]:  # [self.logical_parser, self.relational_parser, self.function_parser]:
            parser_input.seek(pos)  # reset position
            res = parser.parse_input(context, parser_input, error_sink)