Enhanced ExecutionContext to keep track of the execution flow

2020-01-07 15:47:43 +01:00
parent ffd98d7407
commit b4346b5af0
19 changed files with 966 additions and 190 deletions
@@ -32,9 +32,12 @@ class AddConceptInSetEvaluator(OneReturnValueEvaluator):
                self.name,
                True,
                sheerka.new(BuiltinConcepts.USER_INPUT, body=name_node.tokens, user_name="N/A"))
-            sub_context = context.push(desc=f"Recognizing '{name_node}'")
-            r = sheerka.execute(sub_context, ret_val, ALL_STEPS, self.verbose_log)
-            return core.builtin_helpers.expect_one(context, r)
+
+            with context.push(desc=f"Recognizing '{name_node}'") as sub_context:
+                r = sheerka.execute(sub_context, ret_val, ALL_STEPS, self.verbose_log)
+                one_r = core.builtin_helpers.expect_one(context, r)
+                sub_context.add_values(return_values=one_r)
+                return one_r

        isa_node = return_value.value.value
        sheerka = context.sheerka