Fixed #30 : Add variable support in BNF concept definition

Fixed #31 : Add regex support in BNF Concept
Fixed #33 : Do not memorize object during restore

tests/evaluators/EvaluatorTestsUtils.py

@@ -58,7 +58,7 @@ def pr_ret_val(value, parser="parser", source=None):
 
 
 def python_ret_val(source):
-    python_node = PythonNode(source, ast.parse(source, f"<source>", 'eval'))
+    python_node = PythonNode(source.strip(), ast.parse(source.strip(), f"<source>", 'eval'))
     return pr_ret_val(python_node, parser="Python", source=source)
 
 

tests/evaluators/test_DefConceptEvaluator.py

@@ -4,12 +4,13 @@ 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.SheerkaConceptManager import NoFirstTokenError
 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.BnfNodeParser import Sequence, StrMatch, ZeroOrMore, ConceptExpression, VariableExpression
 from parsers.DefConceptParser import DefConceptNode, NameNode, DefConceptParser
 from parsers.PythonParser import PythonNode, PythonParser
 from tests.TestUsingMemoryBasedSheerka import TestUsingMemoryBasedSheerka
@@ -277,3 +278,55 @@ class TestDefConceptEvaluator(TestUsingMemoryBasedSheerka):
         assert evaluated.status
         assert evaluated.body.body.key == "foo2 __var__0"
         assert evaluated.body.body.get_metadata().variables == [("x", None)]
+
+    def test_i_can_eval_when_bnf_concept_with_regex(self):
+        context = self.get_context()
+        def_ret_val = DefConceptParser().parse(context, ParserInput("def concept hello a from bnf r'[a-z]+'=a 'hello'"))
+        evaluated = DefConceptEvaluator().eval(context, def_ret_val)
+
+        assert evaluated.status
+        assert context.sheerka.isinstance(evaluated.body, BuiltinConcepts.NEW_CONCEPT)
+
+        created_concept = evaluated.body.body
+        assert created_concept.get_metadata().name == "hello a"
+        assert created_concept.get_metadata().key == "hello __var__0"
+        assert created_concept.get_metadata().definition == "r'[a-z]+'=a 'hello'"
+        assert created_concept.get_metadata().definition_type == "bnf"
+
+    def test_i_can_eval_when_bnf_concept_with_variable(self):
+        context = self.get_context()
+        def_ret_val = DefConceptParser().parse(context, ParserInput("def concept hello x from bnf 'hello' x"))
+        evaluated = DefConceptEvaluator().eval(context, def_ret_val)
+
+        assert evaluated.status
+        assert context.sheerka.isinstance(evaluated.body, BuiltinConcepts.NEW_CONCEPT)
+
+        created_concept = evaluated.body.body
+        assert created_concept.get_metadata().name == "hello x"
+        assert created_concept.get_metadata().key == "hello __var__0"
+        assert created_concept.get_metadata().definition == "'hello' x"
+        assert created_concept.get_metadata().definition_type == "bnf"
+        assert created_concept.get_metadata().variables == [("x", None)]
+        assert created_concept._bnf == Sequence(StrMatch("hello"), VariableExpression("x"))
+
+    def test_i_cannot_eval_bnf_concept_with_unknown_variable(self):
+        context = self.get_context()
+        def_ret_val = DefConceptParser().parse(context, ParserInput("def concept name from bnf unknown foo"))
+        evaluated = DefConceptEvaluator().eval(context, def_ret_val)
+
+        assert not evaluated.status
+        assert context.sheerka.isinstance(evaluated.body, BuiltinConcepts.ERROR)
+        unknown_concepts = [
+            context.sheerka.new(BuiltinConcepts.UNKNOWN_CONCEPT, body={"name": "foo"}),
+            context.sheerka.new(BuiltinConcepts.UNKNOWN_CONCEPT, body={"name": "unknown"}),
+        ]
+        assert evaluated.body.body == unknown_concepts
+
+    def test_i_cannot_eval_bnf_concept_with_only_variable(self):
+        sheerka, context = self.init_test().unpack()
+        def_ret_val = DefConceptParser().parse(context, ParserInput("def concept foo x from bnf x"))
+        evaluated = DefConceptEvaluator().eval(context, def_ret_val)
+
+        assert not evaluated.status
+        assert sheerka.isinstance(evaluated.body, BuiltinConcepts.ERROR)
+        assert isinstance(evaluated.body.body, NoFirstTokenError)