Refactored to use cached_asts in Concepts, rather than setting up a value directly

tests/test_sheerka.py

@@ -4,7 +4,7 @@ from os import path
 import shutil
 
 from core.builtin_concepts import BuiltinConcepts, ReturnValueConcept, UserInputConcept, ConceptAlreadyInSet
-from core.concept import Concept, PROPERTIES_TO_SERIALIZE, Property
+from core.concept import Concept, PROPERTIES_TO_SERIALIZE, Property, ConceptParts, DoNotResolve
 from core.sheerka import Sheerka, ExecutionContext
 from sdp.sheerkaDataProvider import SheerkaDataProvider, Event
 
@@ -528,6 +528,41 @@ def test_i_can_evaluate_a_concept_with_prop(expr, expected):
     assert evaluated.metadata.is_evaluated
 
 
+def test_i_can_evaluate_metadata_using_do_not_resolve():
+    sheerka = get_sheerka()
+    concept = Concept("foo")
+    concept.cached_asts[ConceptParts.BODY] = DoNotResolve("do not resolve")
+
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+
+    assert evaluated.body == "do not resolve"
+    assert evaluated.metadata.is_evaluated
+
+
+def test_i_can_evaluate_property_using_do_not_resolve():
+    sheerka = get_sheerka()
+    concept = Concept("foo").set_prop("a")
+    concept.cached_asts["a"] = DoNotResolve("do not resolve")
+
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+
+    assert evaluated.get_prop("a") == "do not resolve"
+    assert evaluated.metadata.is_evaluated
+
+
+def test_original_value_is_overridden_when_using_do_no_resolve():
+    sheerka = get_sheerka()
+    concept = Concept("foo", body="original value").set_prop("a", "original value")
+    concept.cached_asts["a"] = DoNotResolve("do not resolve")
+    concept.cached_asts[ConceptParts.BODY] = DoNotResolve("do not resolve")
+
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+
+    assert evaluated.body == "do not resolve"
+    assert evaluated.get_prop("a") == "do not resolve"
+    assert evaluated.metadata.is_evaluated
+
+
 def test_props_are_evaluated_before_body():
     sheerka = get_sheerka()
 
@@ -615,6 +650,8 @@ def test_i_can_evaluate_concept_when_properties_reference_others_concepts():
     concept = Concept("foo", body="a").set_prop("a", "a").init_key()
     evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
 
+    # first prop a is evaluated to concept_a
+    # then body is evaluated to prop a -> concept_a
     assert evaluated.key == concept.key
     assert evaluated.body == concept_a
 
@@ -647,6 +684,31 @@ def test_i_can_evaluate_concept_when_properties_reference_others_concepts_with_b
     assert evaluated.body == 3
 
 
+def test_i_can_evaluate_concept_when_properties_is_a_concept():
+    sheerka = get_sheerka()
+    concept_a = sheerka.add_in_cache(Concept(name="a", body="'a'").init_key())
+
+    concept = Concept("foo").set_prop("a", concept_a)
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+
+    assert evaluated.key == concept.key
+    assert evaluated.get_prop("a") == Concept(name="a", body="a").init_key()
+
+
+def test_i_can_evaluate_when_property_asts_is_a_list():
+    sheerka = get_sheerka()
+    foo = Concept("foo", body="1")
+
+    concept = Concept("to_eval").set_prop("prop")
+    concept.cached_asts["prop"] = [foo, DoNotResolve("1")]
+    evaluated = sheerka.evaluate_concept(get_context(sheerka), concept)
+
+    props = evaluated.get_prop("prop")
+    assert len(props) == 2
+    assert props[0] == Concept("foo", body=1).init_key()
+    assert props[1] == "1"
+
+
 def test_i_can_reference_sheerka():
     sheerka = get_sheerka()