Refactored Caching, Refactored BnfNodeParser, Introduced Sphinx

src/parsers/BnfParser.py

@@ -6,7 +6,7 @@ from core.sheerka.Sheerka import ExecutionContext
 from core.tokenizer import Tokenizer, Token, TokenKind, LexerError
 from parsers.BaseParser import BaseParser, ErrorNode, UnexpectedTokenErrorNode
 from parsers.BnfNodeParser import OrderedChoice, Sequence, Optional, ZeroOrMore, OneOrMore, ConceptExpression, \
-    StrMatch, ConceptGroupExpression
+    StrMatch
 
 
 @dataclass()
@@ -234,8 +234,9 @@ class BnfParser(BaseParser):
         if token.type == TokenKind.CONCEPT:
             self.next_token()
             concept = self.sheerka.new((token.value[0], token.value[1]))
-            expr = ConceptGroupExpression(concept) if self.sheerka.isaset(self.context, concept) \
-                else ConceptExpression(concept)
+            expr = ConceptExpression(concept)
+            # expr = ConceptGroupExpression(concept) if self.sheerka.isaset(self.context, concept) \
+            #     else ConceptExpression(concept)
             return self.eat_rule_name_if_needed(expr)
 
         if token.type == TokenKind.IDENTIFIER:
@@ -259,8 +260,7 @@ class BnfParser(BaseParser):
                                      body=("key", concept_name)))
                 return None
             else:
-                expr = ConceptGroupExpression(concept) if self.sheerka.isaset(self.context, concept) \
-                    else ConceptExpression(concept)
+                expr = ConceptExpression(concept)
                 expr.rule_name = concept.name
                 return self.eat_rule_name_if_needed(expr)