Working on #48 : Simple version of ExpressionParser

tests/parsers/test_ExpressionParser.py

@@ -4,6 +4,7 @@ from core.builtin_concepts_ids import BuiltinConcepts
 from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import Tokenizer
 from parsers.ExpressionParser import ExpressionParser
+from parsers.expressions import VariableNode
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 from tests.parsers.parsers_utils import get_expr_node_from_test_node, VAR, EXPR
 
@@ -17,6 +18,7 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
     def input_parser_with_source(self, source):
         sheerka, context, parser = self.init_parser()
         parser.reset_parser(context, ParserInput(source))
+        parser.parser_input.next_token()
         return sheerka, context, parser
 
     def test_i_can_detect_empty_expression(self):
@@ -27,7 +29,9 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         assert sheerka.isinstance(res.body, BuiltinConcepts.IS_EMPTY)
 
     @pytest.mark.parametrize("expression, expected", [
-        ("something that i do not recognize", EXPR("something that i do not recognize")),
+        ("var1 + var 2", EXPR("var1 + var 2")),
+        ("variable", VAR("variable")),
+        ("var.attr", VAR("var.attr")),
     ])
     def test_i_can_parse_input(self, expression, expected):
         sheerka, context, parser = self.input_parser_with_source(expression)
@@ -38,14 +42,27 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         assert not parser.has_error
         assert parsed == expected
 
+    @pytest.mark.parametrize("expression", [
+        "var.attr1.attr2",
+        "var . attr1 . attr2",
+    ])
+    def test_i_can_parse_variable(self, expression):
+        sheerka, context, parser = self.input_parser_with_source(expression)
+        parsed = parser.parse_input()
+
+        assert not parser.has_error
+        assert isinstance(parsed, VariableNode)
+        assert parsed.name == "var"
+        assert parsed.attributes == ["attr1", "attr2"]
+
     def test_i_can_parse_sub_tokens(self):
         sheerka, context, parser = self.init_parser()
 
-        expression = "do not care var.attr do not care either"
-        parser_input = ParserInput("text", Tokenizer(expression, yield_eof=False), start=6, end=8)
+        expression = "do not care var1 + var2 do not care either"
+        parser_input = ParserInput("text", list(Tokenizer(expression, yield_eof=False)), start=6, end=10)
 
         parser.reset_parser(context, parser_input)
         parsed = parser.parse_input()
 
         assert not parser.has_error
-        assert parsed == get_expr_node_from_test_node(expression, [VAR("var.attr")])
+        assert parsed == get_expr_node_from_test_node(expression, EXPR("var1 + var2"))