Concept validation must be requested

src/evaluators/EvalEvaluator.py

@@ -12,16 +12,9 @@ class EvalEvaluator(AllReturnValuesEvaluator):
 
     def __init__(self):
         super().__init__(self.NAME, [BuiltinConcepts.AFTER_EVALUATION], 80)
-        self.eval_requested = None
 
     def matches(self, context, return_values):
-        sheerka = context.sheerka
-        for ret in return_values:
-            if ret.status and sheerka.isinstance(ret.body, BuiltinConcepts.CONCEPT_VALUE_REQUESTED):
-                self.eval_requested = ret
-                return True
-
-        return False
+        return context.in_context(BuiltinConcepts.CONCEPT_VALUE_REQUESTED)
 
     def eval(self, context, return_values):
         sheerka = context.sheerka
@@ -30,22 +23,16 @@ class EvalEvaluator(AllReturnValuesEvaluator):
         for ret_val in return_values:
             if ret_val.status and isinstance(ret_val.body, Concept) and ret_val.body.body:
                 context.log(f"Evaluating {ret_val.body}", who=self)
-                result.append(sheerka.ret(self.name, True, ret_val.body.body, parents=[ret_val, self.eval_requested]))
+                result.append(sheerka.ret(self.name, True, ret_val.body.body, parents=[ret_val]))
             elif ret_val.status and sheerka.isaset(context, ret_val.body):
                 context.log(f"Evaluating set {ret_val.body}", who=self)
                 result.append(sheerka.ret(
                     self.name,
                     True,
                     sheerka.get_set_elements(context, ret_val.body),
-                    parents=[ret_val, self.eval_requested]))
+                    parents=[ret_val]))
 
         if len(result) > 0:
             return result
-        else:
-            # suppress the successful BuiltinConcepts.CONCEPT_EVAL_REQUESTED
-            # status of CONCEPT_EVAL_REQUESTED is now set to False
-            return sheerka.ret(
-                self.name,
-                False,
-                sheerka.new(BuiltinConcepts.CONCEPT_VALUE_REQUESTED),
-                parents=[self.eval_requested])
+
+        return None