Fixed some bugs

tests/parsers/test_BnfNodeParser.py

@@ -3,8 +3,8 @@ from core.builtin_concepts import BuiltinConcepts
 from core.concept import Concept, ConceptParts, DoNotResolve, CC, DEFINITION_TYPE_BNF
 from core.sheerka.services.SheerkaExecute import ParserInput
 from parsers.BaseNodeParser import CNC, UTN, CN
-from parsers.BnfNodeParser import BnfNodeParser, StrMatch, TerminalNode, NonTerminalNode, Sequence, OrderedChoice, \
-    Optional, ZeroOrMore, OneOrMore, ConceptExpression, UnOrderedChoice
+from parsers.BnfNodeParser import StrMatch, TerminalNode, NonTerminalNode, Sequence, OrderedChoice, \
+    Optional, ZeroOrMore, OneOrMore, ConceptExpression, UnOrderedChoice, BnfNodeParser
 from parsers.BnfParser import BnfParser
 
 import tests.parsers.parsers_utils
@@ -969,7 +969,7 @@ class TestBnfNodeParser(TestUsingMemoryBasedSheerka):
         assert ConceptExpression(my_map["one"], rule_name="one") in number_nodes[0].nodes
         assert ConceptExpression(my_map["twenty"], rule_name="twenty") in number_nodes[0].nodes
 
-    def test_i_can_get_parsing_expression_when_sequence_of_concept(self):
+    def test_i_can_get_parsing_expression_when_sequence_of_concepts(self):
         my_map = {
             "one": Concept("one"),
             "two_ones": self.bnf_concept("two_ones", Sequence(ConceptExpression("one"), ConceptExpression("one")))
@@ -1203,6 +1203,7 @@ class TestBnfNodeParser(TestUsingMemoryBasedSheerka):
 
     def test_i_can_parse_hundreds_like_expression(self):
         sheerka, context, parser = self.init_parser(init_from_sheerka=True)
+        sheerka.concepts_grammars.clear()
 
         text = "three hundred and thirty two"
         three = CC("three", body=DoNotResolve("three"))
@@ -1226,7 +1227,9 @@ class TestBnfNodeParser(TestUsingMemoryBasedSheerka):
                              thirties=thirty_two))
 
         expected_array = compute_expected_array(cmap, text, [expected])
+
         res = parser.parse(context, ParserInput(text))
+
         parser_result = res.value
         concepts_nodes = res.value.value
 
@@ -1400,6 +1403,15 @@ class TestBnfNodeParser(TestUsingMemoryBasedSheerka):
         assert parser.parse(context, ParserInput("foo foo foo bar")).status
         assert not parser.parse(context, ParserInput("foo baz")).status
 
+    def test_i_only_get_the_requested_parsing_expression(self):
+        sheerka, context, parser = self.init_parser(init_from_sheerka=True)
+        parser.context = context
+        parser.sheerka = sheerka
+        sheerka.concepts_grammars.clear()  # to simulate restart
+
+        parser.get_parsing_expression(context, sheerka.resolve("thirties"))
+        assert len(parser.concepts_grammars) == 9  # requested concept + concepts that do not contains UnorderedChoice
+
     @pytest.mark.parametrize("name, expected", [
         (None, []),
         ("", []),