Implemented some enhancement requests

tests/parsers/test_ExpressionParser.py

@@ -5,7 +5,7 @@ from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept
 from core.concept import Concept
 from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import Tokenizer, TokenKind
-from parsers.BaseParser import UnexpectedEofNode, UnexpectedTokenErrorNode
+from parsers.BaseParser import UnexpectedEofParsingError, UnexpectedTokenParsingError
 from parsers.ExpressionParser import PropertyEqualsNode, PropertyEqualsSequenceNode, PropertyContainsNode, AndNode, \
     OrNode, NotNode, LambdaNode, IsaNode, NameExprNode, ExpressionParser, LeftPartNotFoundError, TrueifyVisitor
 
@@ -54,12 +54,12 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         assert expressions == expected
 
     @pytest.mark.parametrize("expression, expected_errors", [
-        ("one or", [UnexpectedEofNode("When parsing 'or'")]),
-        ("one and", [UnexpectedEofNode("When parsing 'and'")]),
+        ("one or", [UnexpectedEofParsingError("When parsing 'or'")]),
+        ("one and", [UnexpectedEofParsingError("When parsing 'and'")]),
         ("and one", [LeftPartNotFoundError()]),
         ("or one", [LeftPartNotFoundError()]),
-        ("or", [LeftPartNotFoundError(), UnexpectedEofNode("When parsing 'or'")]),
-        ("and", [LeftPartNotFoundError(), UnexpectedEofNode("When parsing 'and'")]),
+        ("or", [LeftPartNotFoundError(), UnexpectedEofParsingError("When parsing 'or'")]),
+        ("and", [LeftPartNotFoundError(), UnexpectedEofParsingError("When parsing 'and'")]),
     ])
     def test_i_can_detect_error(self, expression, expected_errors):
         sheerka, context, parser = self.init_parser()
@@ -75,28 +75,28 @@ class TestExpressionParser(TestUsingMemoryBasedSheerka):
         res = parser.parse(context, ParserInput("("))
         assert not res.status
         assert sheerka.isinstance(res.body, BuiltinConcepts.NOT_FOR_ME)
-        assert isinstance(res.body.reason[0], UnexpectedTokenErrorNode)
+        assert isinstance(res.body.reason[0], UnexpectedTokenParsingError)
         assert res.body.reason[0].token.type == TokenKind.EOF
         assert res.body.reason[0].expected_tokens == [TokenKind.RPAR]
 
         res = parser.parse(context, ParserInput(")"))
         assert not res.status
         assert sheerka.isinstance(res.body, BuiltinConcepts.NOT_FOR_ME)
-        assert isinstance(res.body.reason[0], UnexpectedTokenErrorNode)
+        assert isinstance(res.body.reason[0], UnexpectedTokenParsingError)
         assert res.body.reason[0].token.type == TokenKind.RPAR
         assert res.body.reason[0].expected_tokens == []
 
         res = parser.parse(context, ParserInput("one and two)"))
         assert not res.status
         assert sheerka.isinstance(res.body, BuiltinConcepts.ERROR)
-        assert isinstance(res.body.body[0], UnexpectedTokenErrorNode)
+        assert isinstance(res.body.body[0], UnexpectedTokenParsingError)
         assert res.body.body[0].token.type == TokenKind.RPAR
         assert res.body.body[0].expected_tokens == []
 
         res = parser.parse(context, ParserInput("one and two)"))
         assert not res.status
         assert sheerka.isinstance(res.body, BuiltinConcepts.ERROR)
-        assert isinstance(res.body.body[0], UnexpectedTokenErrorNode)
+        assert isinstance(res.body.body[0], UnexpectedTokenParsingError)
         assert res.body.body[0].token.type == TokenKind.RPAR
         assert res.body.body[0].expected_tokens == []