Working on #48 : Working on FunctionParser.py

tests/parsers/test_ExpressionParser.py

@@ -17,7 +17,7 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         parser = ExpressionParser()
         return sheerka, context, parser
 
-    def input_parser_with_source(self, source):
+    def init_parser_with_source(self, source):
         sheerka, context, parser = self.init_parser()
         error_sink = ErrorSink()
         parser_input = ParserInput(source)
@@ -50,7 +50,7 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
 
     ])
     def test_i_can_parse_input(self, expression, expected):
-        sheerka, context, parser, parser_input, error_sink = self.input_parser_with_source(expression)
+        sheerka, context, parser, parser_input, error_sink = self.init_parser_with_source(expression)
         expected = get_expr_node_from_test_node(expression, expected)
 
         parsed = parser.parse_input(context, parser_input, error_sink)
@@ -63,7 +63,7 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         "var . attr1 . attr2",
     ])
     def test_i_can_parse_variable(self, expression):
-        sheerka, context, parser, parser_input, error_sink = self.input_parser_with_source(expression)
+        sheerka, context, parser, parser_input, error_sink = self.init_parser_with_source(expression)
         parsed = parser.parse_input(context, parser_input, error_sink)
 
         assert not error_sink.has_error

tests/parsers/test_FunctionParser.py

@@ -3,6 +3,7 @@ import pytest
 from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept
 from core.sheerka.services.SheerkaExecute import ParserInput
+from parsers.BaseParser import ErrorSink
 from parsers.FunctionParser import FunctionParser
 from parsers.PythonParser import PythonErrorNode
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
@@ -42,6 +43,13 @@ class TestFunctionParser(TestUsingMemoryBasedSheerka):
         parser = FunctionParser()
         return sheerka, context, parser
 
+    def init_parser_with_source(self, source):
+        sheerka, context, parser = self.init_parser()
+        error_sink = ErrorSink()
+        parser_input = ParserInput(source)
+        parser.reset_parser_input(parser_input, error_sink)
+        return sheerka, context, parser, parser_input, error_sink
+
     def test_i_can_detect_empty_expression(self):
         sheerka, context, parser = self.init_parser()
         res = parser.parse(context, ParserInput(""))
@@ -73,28 +81,16 @@ class TestFunctionParser(TestUsingMemoryBasedSheerka):
                 (FN("func4(", (")", 2), ["three"]), None),
             ]), None)
         ])),
+        ("func(r:|1:)", FN("func(", ")", ["r:|1:"]))
     ])
     def test_i_can_parse_function(self, expression, expected):
-        sheerka, context, parser = self.init_parser()
-
-        parser.reset_parser(context, ParserInput(expression))
-        parser.parser_input.next_token()
-
-        res = parser.parse_function()
+        sheerka, context, parser, parser_input, error_sink = self.init_parser_with_source(expression)
         expected = get_expr_node_from_test_node(expression, expected)
-        assert res == expected
 
-    def test_i_can_parse_function_when_rule(self):
-        sheerka, context, parser = self.init_parser()
-        expected = FN("func(", ")", ["r:|1:"])
+        parsed = parser.parse_input(context, parser_input, error_sink)
 
-        parser.reset_parser(context, ParserInput("func(r:|1:)"))
-        parser.parser_input.next_token()
-
-        res = parser.parse_function()
-
-        transformed_res = get_test_obj(res, expected)
-        assert transformed_res == expected
+        assert not error_sink.has_error
+        assert parsed == expected
 
     @pytest.mark.parametrize("text, expected", [
         ("func()", SCN("func()")),