Added chicken and egg recursion detection

src/evaluators/AddConceptEvaluator.py

@@ -6,8 +6,8 @@ from evaluators.BaseEvaluator import OneReturnValueEvaluator
 from parsers.BaseParser import NotInitializedNode
 from parsers.ConceptLexerParser import ParsingExpression, ParsingExpressionVisitor
 from parsers.DefaultParser import DefConceptNode
-
 from parsers.PythonParser import PythonNode
+import core.utils
 
 
 class ConceptOrRuleNameVisitor(ParsingExpressionVisitor):
@@ -66,7 +66,7 @@ class AddConceptEvaluator(OneReturnValueEvaluator):
             setattr(concept.metadata, prop, source)
 
             # try to find what can be a property
-            concept_name = [part.value for part in def_concept_node.name.tokens]
+            concept_name = [part.value for part in core.utils.strip_tokens(def_concept_node.name.tokens, True)]
             for p in self.get_props(sheerka, part_ret_val, concept_name):
                 props_found.add(p)
 
@@ -108,11 +108,12 @@ class AddConceptEvaluator(OneReturnValueEvaluator):
         # Case of python code
         #
         if isinstance(ret_value.value, ParserResultConcept) and isinstance(ret_value.value.value, PythonNode):
-            python_node = ret_value.value.value
-            as_concept_node = python_to_concept(python_node.ast_)
-            variables = get_names(sheerka, as_concept_node)
-            variables = filter(lambda x: x in concept_name, variables)
-            return list(variables)
+            if len(concept_name) > 1:
+                python_node = ret_value.value.value
+                as_concept_node = python_to_concept(python_node.ast_)
+                variables = get_names(sheerka, as_concept_node)
+                variables = filter(lambda x: x in concept_name, variables)
+                return list(variables)
 
         #
         # case of concept