Concepts bodies are now evaluated on demand

tests/evaluators/test_EvalEvaluator.py

@@ -5,7 +5,7 @@ from core.concept import Concept
 from evaluators.EvalEvaluator import EvalEvaluator
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
-eval_requested = ReturnValueConcept("some_name", True, Concept(key=BuiltinConcepts.CONCEPT_EVAL_REQUESTED))
+value_requested = ReturnValueConcept("some_name", True, Concept(key=BuiltinConcepts.CONCEPT_VALUE_REQUESTED))
 
 
 def retval(obj, who="who", status=True):
@@ -26,7 +26,7 @@ class TestEvalEvaluator(TestUsingMemoryBasedSheerka):
             ReturnValueConcept("some_name", False, Concept(name="1", body="'not to eval'")),
             to_eval1,
             to_eval2,
-            eval_requested
+            value_requested
         ]
 
         evaluator = EvalEvaluator()
@@ -35,16 +35,16 @@ class TestEvalEvaluator(TestUsingMemoryBasedSheerka):
         evaluated = evaluator.eval(context, return_values)
         assert len(evaluated) == 2
         assert evaluated[0].value == to_eval1.body.body
-        assert evaluated[0].parents == [to_eval1, eval_requested]
+        assert evaluated[0].parents == [to_eval1, value_requested]
 
         assert evaluated[1].value == to_eval2.body.body
-        assert evaluated[1].parents == [to_eval2, eval_requested]
+        assert evaluated[1].parents == [to_eval2, value_requested]
 
     @pytest.mark.parametrize("return_values, expected", [
-        ([retval(Concept("foo", body="bar")), eval_requested], True),
-        ([retval(Concept("status is false", body="bar"), status=False), eval_requested], True),
-        ([retval("string_value"), eval_requested], True),
-        ([retval(Concept("no body")), eval_requested], True),
+        ([retval(Concept("foo", body="bar")), value_requested], True),
+        ([retval(Concept("status is false", body="bar"), status=False), value_requested], True),
+        ([retval("string_value"), value_requested], True),
+        ([retval(Concept("no body")), value_requested], True),
         ([retval(Concept("eval requested missing", body="bar"))], False),
     ])
     def test_i_cannot_match_if_eval_request_is_not_present(self, return_values, expected):
@@ -58,7 +58,7 @@ class TestEvalEvaluator(TestUsingMemoryBasedSheerka):
             ReturnValueConcept("some_name", True, "not to eval"),
             ReturnValueConcept("some_name", True, Concept(name="not to eval")),
             ReturnValueConcept("some_name", False, Concept(name="1", body="not to eval")),
-            eval_requested
+            value_requested
         ]
 
         evaluator = EvalEvaluator()
@@ -68,8 +68,8 @@ class TestEvalEvaluator(TestUsingMemoryBasedSheerka):
         assert evaluated == ReturnValueConcept(
             "evaluators.Eval",
             False,
-            context.sheerka.new(BuiltinConcepts.CONCEPT_EVAL_REQUESTED))
-        assert evaluated.parents == [eval_requested]
+            context.sheerka.new(BuiltinConcepts.CONCEPT_VALUE_REQUESTED))
+        assert evaluated.parents == [value_requested]
 
     def test_i_can_evaluate_sets(self):
         sheerka, context, foo, bar, baz, number = self.init_concepts(
@@ -79,7 +79,7 @@ class TestEvalEvaluator(TestUsingMemoryBasedSheerka):
             Concept("number"))
         sheerka.sets_handler.add_concepts_to_set(context, [foo, bar, baz], number)
 
-        return_values = [retval(number), eval_requested]
+        return_values = [retval(number), value_requested]
 
         evaluator = EvalEvaluator()
         evaluator.matches(context, return_values)