Added RET keyword

tests/evaluators/test_AddConceptEvaluator.py

@@ -1,6 +1,6 @@
 import ast
-import pytest
 
+import pytest
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
 from core.concept import VARIABLE_PREFIX, Concept, DEFINITION_TYPE_BNF, DEFINITION_TYPE_DEF
 from core.tokenizer import Tokenizer
@@ -52,7 +52,8 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
             )
         )
 
-    def get_def_concept(self, name, where=None, pre=None, post=None, body=None, definition=None, bnf_def=None):
+    def get_def_concept(self, name, where=None, pre=None, post=None, body=None, ret=None,
+                        definition=None, bnf_def=None):
         def_concept = DefConceptNode([], name=NameNode(list(Tokenizer(name))))
 
         if body:
@@ -63,6 +64,8 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
             def_concept.pre = self.get_concept_part(pre)
         if post:
             def_concept.post = self.get_concept_part(post)
+        if ret:
+            def_concept.ret = self.get_concept_part(ret)
         if bnf_def:
             def_concept.definition = bnf_def
             def_concept.definition_type = DEFINITION_TYPE_BNF
@@ -91,7 +94,8 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
             bnf_def=self.get_return_value("hello a", Sequence(StrMatch("hello"), StrMatch("a"))),
             where="isinstance(a, str )",
             pre="a is not None",
-            body="print('hello' + a)")
+            body="print('hello' + a)",
+            ret="a")
 
         evaluated = AddConceptEvaluator().eval(context, def_concept_return_value)
 
@@ -103,8 +107,9 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert created_concept.metadata.key == "hello __var__0"
         assert created_concept.metadata.where == "isinstance(a, str )"
         assert created_concept.metadata.pre == "a is not None"
-        assert created_concept.metadata.post is None
+        assert created_concept.metadata.post is None  # test that NotInitialized is mapped into None
         assert created_concept.metadata.body == "print('hello' + a)"
+        assert created_concept.metadata.ret == "a"
         assert created_concept.metadata.definition == "hello a"
         assert created_concept.metadata.definition_type == "bnf"