Refactored to use a single implementation for concept evaluation

evaluators/PythonEvaluator.py

@@ -28,6 +28,7 @@ class PythonEvaluator(OneReturnValueEvaluator):
         node = return_value.value.value
         try:
             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)
 
@@ -51,6 +52,7 @@ class PythonEvaluator(OneReturnValueEvaluator):
         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
 
@@ -60,18 +62,23 @@ class PythonEvaluator(OneReturnValueEvaluator):
 
         for name in unreferenced_names_visitor.names:
             context.log(self.verbose_log, f"Resolving '{name}'.", self.name)
+
+            if name in my_locals:
+                context.log(self.verbose_log, f"Using value from property.", self.name)
+                continue
+
             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
 
-            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)
+            context.log(self.verbose_log, f"'{name}' is a concept. Evaluating.", self.name)
+            sub_context = context.push(self.name, desc=f"Evaluating '{concept}'", obj=concept)
             sub_context.log_new(self.verbose_log)
-            context.sheerka.eval_concept(sub_context, concept, ["body"], self.verbose_log)
+            evaluated = context.sheerka.evaluate_concept(sub_context, concept, self.verbose_log)
 
-            if not context.sheerka.isa(concept.body, BuiltinConcepts.ERROR):
-                my_locals[name] = concept.body
+            if evaluated.key == concept.key:
+                my_locals[name] = evaluated.body or evaluated
 
         return my_locals