Added chicken and egg recursion detection

tests/evaluators/test_AddConceptEvaluator.py

@@ -69,9 +69,8 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         return ReturnValueConcept(BaseParser.PREFIX + "some_name", True, ParserResultConcept(value=concept))
 
     @pytest.mark.parametrize("ret_val, expected", [
-        (
-            ReturnValueConcept(BaseParser.PREFIX + "some_name", True, ParserResultConcept(value=DefConceptNode([]))),
-            True),
+        (ReturnValueConcept(BaseParser.PREFIX + "some_name", True, ParserResultConcept(value=DefConceptNode([]))),
+         True),
         (ReturnValueConcept(BaseParser.PREFIX + "some_name", False, ParserResultConcept(value=DefConceptNode([]))),
          False),
         (ReturnValueConcept(BaseParser.PREFIX + "some_name", True, "not a ParserResultConcept"), False),
@@ -133,11 +132,17 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
 
         assert from_db.compiled == {}  # ast is not saved in db
 
-    def test_i_can_get_props_from_python_node(self):
+    def test_i_can_get_props_from_python_node_when_long_name(self):
         ret_val = self.get_concept_part("isinstance(a, str)")
         context = self.get_context()
 
-        assert AddConceptEvaluator.get_props(context.sheerka, ret_val, ["a"]) == ["a"]
+        assert AddConceptEvaluator.get_props(context.sheerka, ret_val, ["a", "b"]) == ["a"]
+
+    def test_i_cannot_get_props_from_python_node_when_name_has_only_one_token(self):
+        ret_val = self.get_concept_part("isinstance(a, str)")
+        context = self.get_context()
+
+        assert AddConceptEvaluator.get_props(context.sheerka, ret_val, ["a"]) == []
 
     def test_i_can_get_props_from_another_concept(self):
         concept = Concept("hello").def_prop("a").def_prop("b")
@@ -153,3 +158,16 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         ret_val = self.get_return_value("mult (('+'|'-') add)?", parsing_expression)
 
         assert AddConceptEvaluator.get_props(self.get_context(), ret_val, []) == ["add", "mult"]
+
+    def test_concept_that_references_itself_is_correctly_created(self):
+        context = self.get_context()
+        def_concept_as_return_value = self.get_def_concept("foo", body="foo")
+
+        ret_val = AddConceptEvaluator().eval(context, def_concept_as_return_value)
+
+        assert ret_val.status
+        new_concept = ret_val.body.body
+        assert new_concept.name == 'foo'
+        assert new_concept.metadata.body == 'foo'
+        assert new_concept.props == {}
+        assert new_concept.metadata.props == []

tests/evaluators/test_ConceptEvaluator.py

@@ -103,7 +103,7 @@ class TestAddConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert context.sheerka.isinstance(result.value, BuiltinConcepts.CONCEPT_EVAL_ERROR)
         assert result.value.concept == concept_plus
         assert result.value.property_name == "b"
-        assert context.sheerka.isinstance(result.value.error, BuiltinConcepts.TOO_MANY_ERRORS)
+        assert context.sheerka.isinstance(result.value.error, BuiltinConcepts.ERROR)
 
     def test_that_error_concepts_are_transformed_into_errors_only_if_the_key_is_different(self):
         context = self.get_context()