Enhanced PythonEvaluator to accept concepts

evaluators/MutipleSameSuccessEvaluator.py

@@ -1,5 +1,6 @@
 from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept
+import core.builtin_helpers
 from evaluators.BaseEvaluator import AllReturnValuesEvaluator, BaseEvaluator
 import logging
 
@@ -36,7 +37,7 @@ class MultipleSameSuccessEvaluator(AllReturnValuesEvaluator):
             elif ret.who.startswith(BaseEvaluator.PREFIX):
                 if ret.status:
                     nb_successful_evaluators += 1
-                    self.success.append(ret.value)
+                    self.success.append(ret)
             elif ret.who.startswith(BaseParser.PREFIX):
                 if ret.status:
                     only_parsers_in_error = False
@@ -46,19 +47,9 @@ class MultipleSameSuccessEvaluator(AllReturnValuesEvaluator):
         return after_evaluation and nb_successful_evaluators > 1 and only_parsers_in_error and not unlisted
 
     def eval(self, context, return_values):
-        reference = self.get_value(self.success[0])
-
-        for return_value in self.success[1:]:
-            actual = self.get_value(return_value)
-            if actual != reference:
-                return None
-
         sheerka = context.sheerka
-        return sheerka.ret(self.name, True, reference, parents=return_values)
+        if core.builtin_helpers.is_same_success(sheerka, self.success):
+            reference = sheerka.value(self.success[0].value, allow_none_body=True)
+            return sheerka.ret(self.name, True, reference, parents=return_values)
 
-    @staticmethod
-    def get_value(obj):
-        if not isinstance(obj, Concept):
-            return obj
-
-        return obj if obj.body is None else obj.body
+        return None