We can now use concept sets in BNF definitions

tests/test_DefaultParser.py

@@ -2,6 +2,7 @@ import pytest
 import ast
 
 from core.builtin_concepts import ParserResultConcept, BuiltinConcepts, ReturnValueConcept
+from core.concept import Concept
 from core.sheerka import Sheerka, ExecutionContext
 from parsers.ConceptLexerParser import OrderedChoice, StrMatch, ConceptExpression
 from parsers.PythonParser import PythonParser, PythonNode
@@ -191,8 +192,7 @@ def concept add one to a as
     return_value = res.value
 
     assert not res.status
-    assert isinstance(return_value, ParserResultConcept)
-    assert sheerka.isinstance(return_value.value[0], BuiltinConcepts.TOO_MANY_ERRORS)
+    assert context.sheerka.isinstance(return_value, BuiltinConcepts.TOO_MANY_ERRORS)
 
 
 def test_name_is_mandatory():
@@ -239,8 +239,7 @@ def test_i_can_detect_error_in_declaration(text):
     return_value = res.value
 
     assert not res.status
-    assert isinstance(return_value, ParserResultConcept)
-    assert sheerka.isinstance(return_value.value[0], BuiltinConcepts.TOO_MANY_ERRORS)
+    assert sheerka.isinstance(return_value, BuiltinConcepts.TOO_MANY_ERRORS)
 
 
 def test_new_line_is_not_allowed_in_the_name():
@@ -255,11 +254,15 @@ def test_new_line_is_not_allowed_in_the_name():
 
 
 def test_i_can_parse_def_concept_from_regex():
+    context = get_context()
+    a_concept = Concept("a_concept")
+    context.sheerka.add_in_cache(a_concept)
+
     text = "def concept name from bnf a_concept | 'a_string' as __definition[0]"
     parser = DefaultParser()
-    res = parser.parse(get_context(), text)
+    res = parser.parse(context, text)
     node = res.value.value
-    definition = OrderedChoice(ConceptExpression("a_concept"), StrMatch("a_string"))
+    definition = OrderedChoice(a_concept, StrMatch("a_string"))
     parser_result = ParserResultConcept(BnfParser(), "a_concept | 'a_string'", definition, definition)
     expected = get_def_concept(name="name", body="__definition[0]", definition=parser_result)
 
@@ -270,6 +273,18 @@ def test_i_can_parse_def_concept_from_regex():
     assert node == expected
 
 
+def test_i_can_parse_def_concept_where_bnf_references_itself():
+    context = get_context()
+    a_concept = Concept("a_concept")
+    context.sheerka.add_in_cache(a_concept)
+
+    text = "def concept name from bnf 'a' + name?"
+    parser = DefaultParser()
+    parser.parse(context, text)
+
+    assert not parser.has_error
+
+
 def test_i_can_detect_empty_bnf_declaration():
     text = "def concept name from bnf as __definition[0]"
 
@@ -339,3 +354,15 @@ def test_i_cannot_parse_when_tokenizer_fails(text, error_msg, error_text):
     assert isinstance(res.body.body[0], LexerError)
     assert res.body.body[0].message == error_msg
     assert res.body.body[0].text == error_text
+
+
+def test_i_cannot_parse_bnf_definition_referencing_unknown_concept():
+    context = get_context()
+    text = "def concept name from bnf unknown"
+
+    parser = DefaultParser()
+    res = parser.parse(context, text)
+
+    assert not res.status
+    assert context.sheerka.isinstance(res.value, BuiltinConcepts.UNKNOWN_CONCEPT)
+    assert res.value.body == ("key", "unknown")