Refactored Concept class for better separation of metadata, compiled and values

tests/test_sheerka_non_reg.py

@@ -5,7 +5,7 @@ from os import path
 import pytest
 
 from core.builtin_concepts import BuiltinConcepts
-from core.concept import Concept, PROPERTIES_TO_SERIALIZE, Property
+from core.concept import Concept, PROPERTIES_TO_SERIALIZE, Property, simplec
 from core.sheerka import Sheerka, ExecutionContext
 from evaluators.MutipleSameSuccessEvaluator import MultipleSameSuccessEvaluator
 from parsers.ConceptLexerParser import Sequence, StrMatch, OrderedChoice, Optional, ConceptExpression
@@ -50,8 +50,8 @@ def get_default_concept():
         post="isinstance(res, int)",
         body="def func(x,y):\n    return x+y\nfunc(a,b)",
         desc="specific description")
-    concept.set_prop("a", "value1")
-    concept.set_prop("b", "value2")
+    concept.def_prop("a", "value1")
+    concept.def_prop("b", "value2")
 
     return concept
 
@@ -79,7 +79,7 @@ def test_i_can_eval_concept_with_python_body():
     res = sheerka.evaluate_user_input(text)
     assert len(res) == 1
     assert res[0].status
-    assert res[0].value == Concept(name="one", body=1).init_key()  # by default, the concept is returned
+    assert res[0].value == simplec("one", 1)  # by default, the concept is returned
 
 
 def test_i_can_eval_concept_with_concept_body():
@@ -93,7 +93,7 @@ def test_i_can_eval_concept_with_concept_body():
     return_value = res[0].value
     assert len(res) == 1
     assert res[0].status
-    assert return_value == Concept(name="un", body=Concept(name="one").init_key()).init_key()
+    assert return_value == simplec("un", simplec("one", None))
 
 
 def test_i_can_eval_concept_with_no_body():
@@ -137,6 +137,7 @@ as:
     expected = get_default_concept()
     expected.metadata.id = "1001"
     expected.metadata.desc = None
+    expected.metadata.props = [("a", None), ("b", None)]
     expected.init_key()
 
     sheerka = get_sheerka()
@@ -165,11 +166,11 @@ def test_i_can_eval_def_concept_part_when_one_part_is_a_ref_of_another_concept()
     sheerka = get_sheerka()
 
     # concept 'a plus b' is known
-    concept_a_plus_b = Concept(name="a plus b").set_prop("a").set_prop("b")
+    concept_a_plus_b = Concept(name="a plus b").def_prop("a").def_prop("b")
     sheerka.add_in_cache(concept_a_plus_b)
 
     res = sheerka.evaluate_user_input("def concept a xx b as a plus b")
-    expected = Concept(name="a xx b", body="a plus b").set_prop("a").set_prop("b").init_key()
+    expected = Concept(name="a xx b", body="a plus b").def_prop("a").def_prop("b").init_key()
     expected.metadata.id = "1001"
 
     assert len(res) == 1
@@ -224,7 +225,7 @@ def test_i_can_eval_a_empty_input(text):
 
 def test_i_can_eval_concept_with_variable():
     sheerka = get_sheerka()
-    concept_hello = Concept(name="hello a").set_prop("a")
+    concept_hello = Concept(name="hello a").def_prop("a")
     concept_foo = Concept(name="foo")
     sheerka.add_in_cache(concept_hello)
     sheerka.add_in_cache(concept_foo)
@@ -239,7 +240,7 @@ def test_i_can_eval_concept_with_variable():
 
 def test_i_can_eval_concept_with_variable_and_python_as_body():
     sheerka = get_sheerka()
-    hello_a = sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").set_prop("a"))
+    hello_a = sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").def_prop("a"))
     sheerka.add_in_cache(Concept(name="foo", body="'foo'"))
 
     res = sheerka.evaluate_user_input("hello foo")
@@ -248,14 +249,14 @@ def test_i_can_eval_concept_with_variable_and_python_as_body():
     assert sheerka.isinstance(res[0].value, hello_a)
     assert res[0].value.body == "hello foo"
     assert res[0].value.metadata.is_evaluated
-    assert res[0].value.props["a"].value == Concept(name="foo", body="foo").init_key()
+    assert res[0].value.props["a"].value == simplec("foo", "foo")
     assert res[0].value.props["a"].value.metadata.is_evaluated
 
 
 def test_i_can_eval_duplicate_concepts_with_same_value():
     sheerka = get_sheerka()
 
-    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").set_prop("a"))
+    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").def_prop("a"))
     sheerka.add_in_cache(Concept(name="hello foo", body="'hello foo'"))
     sheerka.add_in_cache(Concept(name="foo", body="'foo'"))
 
@@ -269,7 +270,7 @@ def test_i_can_eval_duplicate_concepts_with_same_value():
 def test_i_cannot_manage_duplicate_concepts_when_the_values_are_different():
     sheerka = get_sheerka()
 
-    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").set_prop("a"))
+    sheerka.add_in_cache(Concept(name="hello a", body="'hello ' + a").def_prop("a"))
     sheerka.add_in_cache(Concept(name="hello foo", body="'hello foo'"))
     sheerka.add_in_cache(Concept(name="foo", body="'another value'"))
 
@@ -289,8 +290,8 @@ def test_i_can_manage_concepts_with_the_same_key_when_values_are_the_same():
     sheerka = get_sheerka()
     context = get_context(sheerka)
 
-    sheerka.create_new_concept(context, Concept(name="hello a", body="'hello ' + a").set_prop("a"))
-    sheerka.create_new_concept(context, Concept(name="hello b", body="'hello ' + b").set_prop("b"))
+    sheerka.create_new_concept(context, Concept(name="hello a", body="'hello ' + a").def_prop("a"))
+    sheerka.create_new_concept(context, Concept(name="hello b", body="'hello ' + b").def_prop("b"))
 
     res = sheerka.evaluate_user_input("hello 'foo'")
     assert len(res) == 1
@@ -453,10 +454,10 @@ def test_i_can_mix_concept_with_python_to_define_numbers(desc, definitions):
     assert res[0].status
     assert res[0].body == 22
 
-    # res = sheerka.evaluate_user_input("1 + 1 + twenty one")
-    # assert len(res) == 1
-    # assert res[0].status
-    # assert res[0].body == 23
+    res = sheerka.evaluate_user_input("1 + 1 + twenty one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body == 23
 
 
 def test_i_can_mix_concept_of_concept():
@@ -472,20 +473,20 @@ def test_i_can_mix_concept_of_concept():
     for definition in definitions:
         sheerka.evaluate_user_input(definition)
 
-    # res = sheerka.evaluate_user_input("1 plus 2")
-    # assert len(res) == 1
-    # assert res[0].status
-    # assert res[0].body.body == 3
-    #
-    # res = sheerka.evaluate_user_input("1 plus one")
-    # assert len(res) == 1
-    # assert res[0].status
-    # assert res[0].body.body == 2
-    
-    # res = sheerka.evaluate_user_input("1 + 1 plus 1")
-    # assert len(res) == 1
-    # assert res[0].status
-    # assert res[0].body.body == 3
+    res = sheerka.evaluate_user_input("1 plus 2")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body.body == 3
+
+    res = sheerka.evaluate_user_input("1 plus one")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body.body == 2
+
+    res = sheerka.evaluate_user_input("1 + 1 plus 1")
+    assert len(res) == 1
+    assert res[0].status
+    assert res[0].body.body == 3
 
     res = sheerka.evaluate_user_input("1 plus twenty one")
     assert len(res) == 1