Working on #48 : Updating ExpressionParser.py

src/parsers/ExpressionParser.py

@@ -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)

src/parsers/LogicalOperatorParser.py

@@ -185,7 +185,8 @@ class LogicalOperatorParser(BaseExprParser):
     def parse_not(self, context, parser_input, error_sink):
         token = parser_input.token
         start = parser_input.pos
-        if token.type == TokenKind.IDENTIFIER and token.value == "not":
+        if (token.type == TokenKind.IDENTIFIER and token.value == "not" and
+            parser_input.the_token_after(True).value != "in"):
             parser_input.next_token()
             parsed = self.parse_not(context, parser_input, error_sink)
             node = parsed.node if isinstance(parsed, ParenthesisNode) else parsed
@@ -201,7 +202,8 @@ class LogicalOperatorParser(BaseExprParser):
         def stop():
             return token.type == TokenKind.EOF or \
                    paren_count == 0 and token.type == TokenKind.RPAR or \
-                   token.type == TokenKind.IDENTIFIER and token.value in ("and", "or", "not")
+                   token.type == TokenKind.IDENTIFIER and token.value in ("and", "or") or \
+                   token.value == "not" and parser_input.the_token_after(True).value != "in"
 
         token = parser_input.token
         if token.type == TokenKind.EOF:

src/parsers/RelationalOperatorParser.py

@@ -167,7 +167,7 @@ class RelationalOperatorParser(BaseExprParser):
     @staticmethod
     def eat_comparison(parser_input, eat=True):
         token = parser_input.token
-        if token.type == TokenKind.EQUALSEQUALS:
+        if token.type in (TokenKind.EQUALS, TokenKind.EQUALSEQUALS):
             if eat:
                 parser_input.next_token()
             return ComparisonType.EQUALS