Fixed initialisation issue for concepts with BNF definition

evaluators/ConceptEvaluator.py

@@ -29,12 +29,13 @@ class ConceptEvaluator(OneReturnValueEvaluator):
     def eval(self, context, return_value):
         sheerka = context.sheerka
         concept = return_value.value.value
+        context.log(self.verbose_log, f"Evaluating concept {concept}.", self.name)
 
         # pre condition should already be validated by the parser.
         # It's a mandatory condition for the concept before it can be recognized
 
         if len(concept.cached_asts) == 0:
-            sheerka.initialize_concept_asts(context, concept)
+            sheerka.initialize_concept_asts(context, concept, self.verbose_log)
 
         # TODO; check pre
         # if pre is not true, return Concept with a false value

evaluators/PythonEvaluator.py

@@ -27,18 +27,19 @@ class PythonEvaluator(OneReturnValueEvaluator):
         sheerka = context.sheerka
         node = return_value.value.value
         try:
-            context.log(self.verbose_log, f"Evaluating python node {node}", self.name)
+            context.log(self.verbose_log, f"Evaluating python node {node}.", self.name)
             my_locals = self.get_locals(context, node.ast_)
             context.log(self.verbose_log, f"locals={my_locals}", self.name)
 
             if isinstance(node.ast_, ast.Expression):
-                context.log(self.verbose_log, "Evaluating using 'eval'", self.name)
+                context.log(self.verbose_log, "Evaluating using 'eval'.", self.name)
                 compiled = compile(node.ast_, "<string>", "eval")
                 evaluated = eval(compiled, {}, my_locals)
             else:
-                context.log(self.verbose_log, "Evaluating using 'exec'", self.name)
+                context.log(self.verbose_log, "Evaluating using 'exec'.", self.name)
                 evaluated = self.exec_with_return(node.ast_, my_locals)
 
+            context.log(self.verbose_log, f"{evaluated=}", self.name)
             return sheerka.ret(self.name, True, evaluated, parents=[return_value])
         except Exception as error:
             context.log_error(self.verbose_log, error, self.name)
@@ -48,6 +49,8 @@ class PythonEvaluator(OneReturnValueEvaluator):
     def get_locals(self, context, ast_):
         my_locals = {"sheerka": context.sheerka}
         if context.obj:
+            context.log(self.verbose_log,
+                        f"Concept '{context.obj}' is in context. Adding its properties to locals if any.", self.name)
             for prop_name, prop_value in context.obj.props.items():
                 my_locals[prop_name] = prop_value.value
 
@@ -56,12 +59,16 @@ class PythonEvaluator(OneReturnValueEvaluator):
         unreferenced_names_visitor.visit(node_concept)
 
         for name in unreferenced_names_visitor.names:
+            context.log(self.verbose_log, f"Resolving '{name}'.", self.name)
             concept = context.sheerka.new(name)
             if context.sheerka.isinstance(concept, BuiltinConcepts.UNKNOWN_CONCEPT):
+                context.log(self.verbose_log, f"'{name}' is not a concept. Skipping.", self.name)
                 continue
 
-            sub_context = context.push(self.name, desc="Evaluating body", obj=concept)
-            context.sheerka.eval_concept(sub_context, concept, ["body"])
+            context.log(self.verbose_log, f"'{name}' is a concept. Evaluating body.", self.name)
+            sub_context = context.push(self.name, desc=f"Evaluating {concept}'s body", obj=concept)
+            sub_context.log_new(self.verbose_log)
+            context.sheerka.eval_concept(sub_context, concept, ["body"], self.verbose_log)
 
             if not context.sheerka.isa(concept.body, BuiltinConcepts.ERROR):
                 my_locals[name] = concept.body

evaluators/TooManySuccessEvaluator.py

@@ -53,7 +53,11 @@ class TooManySuccessEvaluator(AllReturnValuesEvaluator):
                 context.log(self.verbose_log, f"value={sheerka.value(s.value)}", self.name)
 
         if not core.builtin_helpers.is_same_success(sheerka, self.success):
+            context.log(self.verbose_log,
+                        f"Values are different. Raising {BuiltinConcepts.TOO_MANY_SUCCESS}.", self.name)
             too_many_success = sheerka.new(BuiltinConcepts.TOO_MANY_SUCCESS, body=self.success)
             return sheerka.ret(self.name, False, too_many_success, parents=return_values)
 
+        context.log(self.verbose_log,
+                    f"Values are the same. Nothing to do.", self.name)
         return None