Refactored to use a single implementation for concept evaluation

core/builtin_helpers.py

@@ -1,4 +1,6 @@
 import ast
+import logging
+
 import core.ast.nodes
 from core.ast.nodes import CallNodeConcept, GenericNodeConcept
 from core.ast.visitors import UnreferencedNamesVisitor
@@ -31,12 +33,13 @@ def is_same_success(sheerka, return_values):
     return True
 
 
-def expect_one(context, return_values):
+def expect_one(context, return_values, logger=None):
     """
     Checks if there is at least one success return value
     If there is more than one, check if it's the same value
     :param context:
     :param return_values:
+    :param logger:
     :return:
     """
 
@@ -58,7 +61,6 @@ def expect_one(context, return_values):
 
     # remove errors when a winner is found
     if number_of_successful == 1:
-        # log.debug(f"1 / {total_items} good item found.")
         return sheerka.ret(
             context.who,
             True,
@@ -74,6 +76,10 @@ def expect_one(context, return_values):
                 successful_results[0].value,
                 parents=return_values)
         else:
+            if logger and logger.isEnabledFor(logging.DEBUG):
+                context.log(logger, f"Too many successful results found by expect_one()", context.who)
+                for s in successful_results:
+                    context.log(logger, f"-> {s}", context.who)
             return sheerka.ret(
                 context.who,
                 False,
@@ -81,11 +87,23 @@ def expect_one(context, return_values):
                 parents=return_values)
 
     # only errors, i cannot help you
-    return sheerka.ret(
-        context.who,
-        False,
-        sheerka.new(BuiltinConcepts.TOO_MANY_ERRORS, body=return_values),
-        parents=return_values)
+    if logger and logger.isEnabledFor(logging.DEBUG):
+        context.log(logger, f"Too many errors found by expect_one()", context.who)
+        for s in successful_results:
+            context.log(logger, f"-> {s}", context.who)
+
+    if len(return_values) == 1:
+        return sheerka.ret(
+            context.who,
+            False,
+            return_values[0],
+            parents=return_values)
+    else:
+        return sheerka.ret(
+            context.who,
+            False,
+            sheerka.new(BuiltinConcepts.TOO_MANY_ERRORS, body=return_values),
+            parents=return_values)
 
 
 def get_names(sheerka, concept_node):