Working on #48 : Working

tests/parsers/parsers_utils.py

@@ -13,7 +13,8 @@ from parsers.BaseNodeParser import UnrecognizedTokensNode, SourceCodeNode, RuleN
 from parsers.FunctionParser import FunctionNode
 from parsers.PythonParser import PythonNode
 from parsers.SyaNodeParser import SyaConceptParserHelper
-from parsers.expressions import NameExprNode, AndNode, OrNode, NotNode, VariableNode, ComparisonNode, ComparisonType
+from parsers.expressions import NameExprNode, AndNode, OrNode, NotNode, VariableNode, ComparisonNode, ComparisonType, \
+    ParenthesisNode
 from sheerkarete.common import V
 from sheerkarete.conditions import Condition, AndConditions
 
@@ -66,56 +67,62 @@ class VAR:
 class EQ:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class NEQ:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class GT:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class GTE:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class LT:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class LTE:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class IN:
     left: object
     right: object
-    source = None
+    source: str = None
 
 
 @dataclass
 class NIN:  # for NOT INT
     left: object
     right: object
-    source = None
+    source: str = None
+
+
+@dataclass
+class PAREN:  # for parenthesis node
+    node: object
+    source: str = None
 
 
 class CC:
@@ -1010,6 +1017,12 @@ def get_expr_node_from_test_node(full_text, test_node):
             return ComparisonNode(start, end, full_text_as_tokens[start: end + 1],
                                   node_type, left_node, right_node)
 
+        if isinstance(node, PAREN):
+            value_as_tokens = list(Tokenizer(node.source, yield_eof=False))
+            start = tokens_index(full_text_as_tokens, value_as_tokens, 0)
+            end = start + len(value_as_tokens) - 1
+            return ParenthesisNode(start, end, value_as_tokens, get_expr_node(node.node))
+
     return get_expr_node(test_node)
 
 

tests/parsers/test_LogicalOperatorParser.py

@@ -49,6 +49,9 @@ class TestLogicalOperatorParser(TestUsingMemoryBasedSheerka):
         ("not ((a and b) or (c and d))", NOT(OR(AND(EXPR("a"), EXPR("b")), AND(EXPR("c"), EXPR("d")),
                                                 source="(a and b) or (c and d)"),
                                              source="not ((a and b) or (c and d))")),
+        ("(one and two)", AND(EXPR("one"), EXPR("two"))),
+        ("(one or two)", OR(EXPR("one"), EXPR("two"))),
+        ("(not one)", NOT(EXPR("one"))),
     ])
     def test_i_can_parse_expression(self, expression, expected):
         sheerka, context, parser = self.init_parser()

tests/parsers/test_RelationalOperatorParser.py

@@ -3,16 +3,17 @@ import pytest
 from core.builtin_concepts_ids import BuiltinConcepts
 from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import TokenKind, Tokenizer
-from parsers.ComparisonParser import ComparisonParser
+from parsers.RelationalOperatorParser import RelationalOperatorParser
 from parsers.expressions import ParenthesisMismatchError
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
-from tests.parsers.parsers_utils import get_expr_node_from_test_node, VAR, EXPR, EQ, NEQ, GT, GTE, LT, LTE, IN, NIN
+from tests.parsers.parsers_utils import get_expr_node_from_test_node, VAR, EXPR, EQ, NEQ, GT, GTE, LT, LTE, IN, NIN, \
+    PAREN
 
 
-class TestComparisonParser(TestUsingMemoryBasedSheerka):
+class TestRelationalOperatorParser(TestUsingMemoryBasedSheerka):
     def init_parser(self):
         sheerka, context = self.init_concepts()
-        parser = ComparisonParser()
+        parser = RelationalOperatorParser()
         return sheerka, context, parser
 
     def test_i_can_detect_empty_expression(self):
@@ -35,13 +36,16 @@ class TestComparisonParser(TestUsingMemoryBasedSheerka):
         ("var_name.attr >= 10", GTE(VAR("var_name.attr"), EXPR("10"))),
         ("var_name.attr < 10", LT(VAR("var_name.attr"), EXPR("10"))),
         ("var_name.attr <= 10", LTE(VAR("var_name.attr"), EXPR("10"))),
-        ("var_name.attr in (a, b)", IN(VAR("var_name.attr"), EXPR("(a, b)"))),
-        ("var_name.attr not in (a, b)", NIN(VAR("var_name.attr"), EXPR("(a, b)"))),
+        ("var_name.attr in (a, b)", IN(VAR("var_name.attr"), EXPR("a, b"))),
+        ("var_name.attr not in (a, b)", NIN(VAR("var_name.attr"), EXPR("a, b"))),
         ("var1.attr1 == var2.attr2", EQ(VAR("var1.attr1"), VAR("var2.attr2"))),
+        ("var1.attr1 == (var2.attr2)", EQ(VAR("var1.attr1"), VAR("var2.attr2"))),
+        ("var_name.attr in (a.b, b.c)", IN(VAR("var_name.attr"), PAREN(EXPR("a.b, b.c"), source="(a.b, b.c)"))),
 
         ("not a var identifier", EXPR("not a var identifier")),
         ("func()", EXPR("func()")),
         ("func(a, not an identifier, x >5)", EXPR("func(a, not an identifier, x >5)")),
+        ("(var_name.attr != var_name2.attr2)", NEQ(VAR("var_name.attr"), VAR("var_name2.attr2")))
     ])
     def test_i_can_parse_simple_expressions(self, expression, expected):
         sheerka, context, parser = self.init_parser()
@@ -82,6 +86,18 @@ class TestComparisonParser(TestUsingMemoryBasedSheerka):
             assert res.body.body[0].token.type == parenthesis_type
             assert res.body.body[0].token.index == index
 
+    def test_i_can_detect_syntax_error(self):
+        sheerka, context, parser = self.init_parser()
+
+        expression = "var in a"
+        res = parser.parse(context, ParserInput(expression))
+
+        assert not res.status
+        assert sheerka.isinstance(res.body, BuiltinConcepts.ERROR)
+        assert isinstance(res.body.body[0], UnexpectedTokenError)
+
+
+
     def test_i_can_parse_tokens_rather_than_parser_input(self):
         sheerka, context, parser = self.init_parser()
         expression = "var1.attr1 == var2.attr2"