Renamed ConceptMatch into ConceptExpression and added unit tests

tests/test_sheerka.py

@@ -3,9 +3,11 @@ import os
 from os import path
 import shutil
 
-from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept, UserInputConcept, ConceptAlreadyInSet
+from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept, UserInputConcept, ConceptAlreadyInSet, \
+    ParserResultConcept
 from core.concept import Concept, PROPERTIES_TO_SERIALIZE, Property, ConceptParts, DoNotResolve
 from core.sheerka import Sheerka, ExecutionContext
+from parsers.PythonParser import PythonNode
 from sdp.sheerkaDataProvider import SheerkaDataProvider, Event
 
 tests_root = path.abspath("../build/tests")
@@ -709,6 +711,24 @@ def test_i_can_evaluate_when_property_asts_is_a_list():
     assert props[1] == "1"
 
 
+def test_i_can_evaluate_when_compiled_is_set_up_with_return_value():
+    sheerka = get_sheerka()
+
+    python_node = PythonNode("1 +1 ")
+    parser_result = ParserResultConcept(parser="who", value=python_node)
+
+    concept = Concept("to_eval").set_prop("prop")
+    concept.cached_asts["prop"] = [ReturnValueConcept("who", True, parser_result)]
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+    assert evaluated.get_prop("prop") == 2
+
+    # also works when only one return value
+    concept = Concept("to_eval").set_prop("prop")
+    concept.cached_asts["prop"] = ReturnValueConcept("who", True, parser_result)
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+    assert evaluated.get_prop("prop") == 2
+
+
 def test_i_can_reference_sheerka():
     sheerka = get_sheerka()