Renamed ConceptMatch into ConceptExpression and added unit tests

2020-01-15 19:44:32 +01:00
parent 8152f82c6b
commit 3789ef25d1
12 changed files with 109 additions and 88 deletions
@@ -640,7 +640,8 @@ class Sheerka(Concept):
                sub_context.log_new(logger)

                # when it's a concept, evaluate it
-                if isinstance(to_resolve, Concept):
+                if isinstance(to_resolve, Concept) and \
+                    not context.sheerka.isinstance(to_resolve, BuiltinConcepts.RETURN_VALUE):
                    evaluated = self.evaluate_concept(sub_context, to_resolve)
                    sub_context.add_values(return_values=evaluated)
                    if evaluated.key == to_resolve.key: