Fixed #125: SheerkaErrorManager

Fixed #135: Change services service priorities
Fixed #136: ErrorManager: Implement recognize_error
Fixed #137: BNFNodeParser : Error when parsing regex with sub parsers
Fixed #138: get_last_errors(): real errors sources are lost
Fixed #139: OneError return value removes the origin of the error
Fixed #140: Concept variables are not correctly handled when parsing sub expression
Fixed #143: Implement has_unknown_concepts()

tests/evaluators/test_OneErrorEvaluator.py

@@ -49,7 +49,8 @@ class TestOneErrorEvaluator(TestUsingMemoryBasedSheerka):
         res = evaluator.eval(context, return_values)
 
         assert not res.status
-        assert res.body == "evaluators.one error"
+        assert context.sheerka.isinstance(res.body, BuiltinConcepts.RETURN_VALUE)
+        assert res.body.body == "evaluators.one error"
         assert len(res.parents) == 4
 
     def test_unwanted_return_values_are_not_eaten(self):
@@ -71,7 +72,8 @@ class TestOneErrorEvaluator(TestUsingMemoryBasedSheerka):
         res = evaluator.eval(context, return_values)
 
         assert not res.status
-        assert res.body == "evaluators.one error"
+        assert context.sheerka.isinstance(res.body, BuiltinConcepts.RETURN_VALUE)
+        assert res.body.body == "evaluators.one error"
         assert len(res.parents) == 4
 
         assert a_successful_concept not in res.parents
@@ -89,7 +91,7 @@ class TestOneErrorEvaluator(TestUsingMemoryBasedSheerka):
         assert evaluator.matches(context, return_values)
         res = evaluator.eval(context, return_values)
         assert not res.status
-        assert res.body == false_1.body
+        assert res.body.body == false_1.body
         assert res.parents == return_values
 
         evaluator.reset()
@@ -97,7 +99,7 @@ class TestOneErrorEvaluator(TestUsingMemoryBasedSheerka):
         assert evaluator.matches(context, return_values)
         res = evaluator.eval(context, return_values)
         assert not res.status
-        assert res.body == filtered
+        assert res.body.body == filtered
         assert res.parents == return_values
 
         evaluator.reset()
@@ -105,5 +107,5 @@ class TestOneErrorEvaluator(TestUsingMemoryBasedSheerka):
         assert evaluator.matches(context, return_values)
         res = evaluator.eval(context, return_values)
         assert not res.status
-        assert res.body == false_1.body
+        assert res.body.body == false_1.body
         assert res.parents == return_values

tests/evaluators/test_PythonEvaluator.py

@@ -11,7 +11,7 @@ from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import Tokenizer
 from evaluators.PythonEvaluator import PythonEvaluator, PythonEvalError
 from parsers.BaseNodeParser import SourceCodeNode, SourceCodeWithConceptNode
-from parsers.FunctionParserOld import FunctionParserOld
+from parsers.FunctionParser import FunctionParser
 from parsers.PythonParser import PythonNode, PythonParser
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 from tests.parsers.parsers_utils import CB, compare_with_test_object
@@ -318,7 +318,7 @@ class TestPythonEvaluator(TestUsingMemoryBasedSheerka):
         context = self.get_context()
         context.add_to_short_term_memory("get_obj_name", get_obj_name)
 
-        parsed = FunctionParserOld().parse(context, ParserInput("get_obj_name(r:|1:)"))
+        parsed = FunctionParser().parse(context, ParserInput("get_obj_name(r:|1:)"))
         python_evaluator = PythonEvaluator()
         evaluated = python_evaluator.eval(context, parsed)
 
@@ -344,7 +344,7 @@ class TestPythonEvaluator(TestUsingMemoryBasedSheerka):
         context = self.get_context()
         context.add_to_short_term_memory("return_return_value", return_return_value)
 
-        parsed = FunctionParserOld().parse(context, ParserInput(method))
+        parsed = FunctionParser().parse(context, ParserInput(method))
         python_evaluator = PythonEvaluator()
         evaluated = python_evaluator.eval(context, parsed)
         ret_val = return_return_value(expected_status)
@@ -371,9 +371,9 @@ class TestPythonEvaluator(TestUsingMemoryBasedSheerka):
 
     @pytest.mark.parametrize("parser, value", [
         (PythonParser(), "3"),
-        (FunctionParserOld(), "3"),
+        (FunctionParser(), "3"),
         (PythonParser(), 3),
-        (FunctionParserOld(), 3),
+        (FunctionParser(), 3),
     ])
     def test_i_can_eval_unresolved_rules(self, parser, value):
         context = self.get_context()

tests/evaluators/test_ValidateConceptEvaluator.py

@@ -9,6 +9,7 @@ from evaluators.ValidateConceptEvaluator import ValidateConceptEvaluator
 from parsers.BaseNodeParser import ConceptNode
 from parsers.BaseParser import BaseParser
 from parsers.BnfNodeParser import BnfNodeParser
+from parsers.ExactConceptParser import ExactConceptParser
 from parsers.SyaNodeParser import SyaNodeParser
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 from tests.evaluators.EvaluatorTestsUtils import p_ret_val, pr_ret_val, ret_val
@@ -185,3 +186,15 @@ class TestValidateConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert not res.status
         assert sheerka.isinstance(res.body, BuiltinConcepts.FILTERED)
         assert res.body.body == ret_val.body.body
+
+    def test_i_can_eval_exact_parser_concepts(self):
+        sheerka, context, explain_x = self.init_concepts(
+            Concept("explain x", where="isinstance(x, int)").def_var("x")
+        )
+        evaluator = ValidateConceptEvaluator()
+
+        ret_val = ExactConceptParser().parse(context, ParserInput("explain 1"))[0]
+
+        assert evaluator.matches(context, ret_val)
+        res = evaluator.eval(context, ret_val)
+        assert sheerka.isinstance(res.body.body, explain_x)