Fixed #3: Added sheerka.resolve_rule()

Fixed #5: Refactored SheerkaComparisonManager
Fixed #6: Sya parser no longer works after restart

src/core/builtin_helpers.py

@@ -12,7 +12,7 @@ from core.tokenizer import Keywords
 from core.utils import as_bag
 from parsers.BaseNodeParser import SourceCodeNode, ConceptNode, UnrecognizedTokensNode, SourceCodeWithConceptNode, \
     RuleNode
-from parsers.BaseParser import BaseParser, ParsingError
+from parsers.BaseParser import ParsingError
 
 PARSE_STEPS = [BuiltinConcepts.BEFORE_PARSING, BuiltinConcepts.PARSING, BuiltinConcepts.AFTER_PARSING]
 EVAL_STEPS = PARSE_STEPS + [BuiltinConcepts.BEFORE_EVALUATION, BuiltinConcepts.EVALUATION,
@@ -655,6 +655,28 @@ def ensure_concept_or_rule(*items):
             raise TypeError(f"'{items}' must be a concept or rule")
 
 
+def ensure_bnf(context, concept, parser_name="BaseNodeParser"):
+    if concept.get_metadata().definition_type == DEFINITION_TYPE_BNF and not concept.get_bnf():
+        from parsers.BnfDefinitionParser import BnfDefinitionParser
+        regex_parser = BnfDefinitionParser()
+        desc = f"Resolving BNF '{concept.get_metadata().definition}'"
+        with context.push(BuiltinConcepts.INIT_BNF,
+                          concept,
+                          who=parser_name,
+                          obj=concept,
+                          desc=desc) as sub_context:
+            sub_context.add_inputs(parser_input=concept.get_metadata().definition)
+            bnf_parsing_ret_val = regex_parser.parse(sub_context, concept.get_metadata().definition)
+            sub_context.add_values(return_values=bnf_parsing_ret_val)
+
+            if not bnf_parsing_ret_val.status:
+                raise Exception(bnf_parsing_ret_val.value)
+
+            concept.set_bnf(bnf_parsing_ret_val.body.body)
+            if concept.id:
+                context.sheerka.get_by_id(concept.id).set_bnf(concept.get_bnf())  # update bnf in cache
+
+
 expressions_cache = Cache()