Implemented some enhancement request and fixed some bugs

Fixed #2 : Variables are not recognized when inside a rule token
Fixed #15 : Rule: rete attributes are lost when a new ontology is created
Fixed #14 : ReteNetwork: Format rules must not be added to Rete network
Fixed #16 : DefConcept: Variables are not recognized when they are keyword arguments
Fixed #4 : Comparison are not correctly set when comparison property is a concept
Fixed #14 : Parser: merge FunctionParser.NamesNode and ExpressionParser.NamesNode
Fixed #18 : Parser: Add SourceCodeNode test to UnrecognizedNodeParser
Fixed #20 : At startup Number concept is saved in db a numerous number of time
Fixed #21 : CacheManager: I can remove all elements from a ListIfNeededCache and fill it again
Fixed #22 : CacheManager: I can remove all elements from a SetCache and fill it again
Fixed #23 : HistoryManager: history() no longer works
Fixed #24 : HistoryManager: history() no longer works after creating an exec rule
Fixed #25 : SheerkaMemory: Use MemoryObject instead of sheerka.local
Fixed #26 : Debugger: add the list all available services..
Fixed #27 : CONCEPTS_GRAMMARS_ENTRY does not seems to be in use any more
Fixed #28 : Give order to services

tests/evaluators/test_DefConceptEvaluator.py

@@ -1,16 +1,17 @@
 import ast
 
 import pytest
+
 from core.builtin_concepts import ReturnValueConcept, ParserResultConcept, BuiltinConcepts
 from core.concept import VARIABLE_PREFIX, Concept, DEFINITION_TYPE_BNF, DEFINITION_TYPE_DEF
+from core.sheerka.services.SheerkaExecute import ParserInput
 from core.tokenizer import Tokenizer
 from evaluators.DefConceptEvaluator import DefConceptEvaluator
 from parsers.BaseParser import BaseParser
 from parsers.BnfDefinitionParser import BnfDefinitionParser
 from parsers.BnfNodeParser import Sequence, StrMatch, ZeroOrMore, ConceptExpression
-from parsers.DefConceptParser import DefConceptNode, NameNode
+from parsers.DefConceptParser import DefConceptNode, NameNode, DefConceptParser
 from parsers.PythonParser import PythonNode, PythonParser
-
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
 
 
@@ -244,3 +245,35 @@ class TestDefConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert new_concept.get_metadata().body == 'foo'
         assert new_concept.values() == {}
         assert new_concept.get_metadata().variables == []
+
+    def test_i_can_get_variable_when_rule_is_defined(self):
+        sheerka, context = self.init_test().unpack()
+        def_concept_parser = DefConceptParser()
+
+        parsed_ret_val = def_concept_parser.parse(context, ParserInput("def concept rule x as r:|x:"))
+        assert parsed_ret_val.status  # sanity check
+
+        evaluated = DefConceptEvaluator().eval(context, parsed_ret_val)
+        assert evaluated.status
+        assert evaluated.body.body.key == "rule __var__0"
+        assert evaluated.body.body.get_metadata().variables == [("x", None)]
+
+    def test_i_can_recognize_variable_when_keyword_argument(self):
+        sheerka, context = self.init_test().unpack()
+        def_concept_parser = DefConceptParser()
+
+        parsed_ret_val = def_concept_parser.parse(context, ParserInput("def concept foo1 x as func(param=x)"))
+        assert parsed_ret_val.status  # sanity check
+
+        evaluated = DefConceptEvaluator().eval(context, parsed_ret_val)
+        assert evaluated.status
+        assert evaluated.body.body.key == "foo1 __var__0"
+        assert evaluated.body.body.get_metadata().variables == [("x", None)]
+
+        parsed_ret_val = def_concept_parser.parse(context, ParserInput("def concept foo2 x as func(x=value)"))
+        assert parsed_ret_val.status  # sanity check
+
+        evaluated = DefConceptEvaluator().eval(context, parsed_ret_val)
+        assert evaluated.status
+        assert evaluated.body.body.key == "foo2 __var__0"
+        assert evaluated.body.body.get_metadata().variables == [("x", None)]