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

src/parsers/BaseNodeParser.py

@@ -441,6 +441,11 @@ class GrammarErrorNode(ParsingError):
     message: str
 
 
+@dataclass()
+class NoMatchingTokenError(ParsingError):
+    pos: int
+
+
 class SyaAssociativity(Enum):
     Left = "left"
     Right = "right"
@@ -720,6 +725,35 @@ class CNC(CN):
             txt += f", {k}='{v}'"
         return txt + ")"
 
+    def to_compare(self, other, to_compare_delegate):
+        """
+        Transform other into CNC, to ease the comparison
+        :param other:
+        :param to_compare_delegate:
+        :return:
+        """
+
+        if isinstance(other, CNC):
+            return other
+
+        if isinstance(other, ConceptNode):
+            if self.exclude_body:
+                compiled = {k: v for k, v in other.concept.get_compiled().items() if k != ConceptParts.BODY}
+            else:
+                compiled = other.concept.get_compiled()
+
+            self_compile_to_use = self.compiled or compiled
+
+            compiled = to_compare_delegate(self_compile_to_use, compiled, to_compare_delegate)
+            return CNC(other.concept,
+                       other.start if self.start is not None else None,
+                       other.end if self.end is not None else None,
+                       other.source if self.source is not None else None,
+                       self.exclude_body,
+                       **compiled)
+
+        raise NotImplementedError("CNC")
+
 
 class UTN(HelperWithPos):
     """
@@ -763,6 +797,24 @@ class UTN(HelperWithPos):
             txt += f", end={self.end}"
         return txt + ")"
 
+    def to_compare(self, other, to_compare_delegate):
+        """
+        Transform other into CNC, to ease the comparison
+        :param other:
+        :param to_compare_delegate:
+        :return:
+        """
+
+        if isinstance(other, UTN):
+            return other
+
+        if isinstance(other, UnrecognizedTokensNode):
+            return UTN(other.source,
+                       other.start,
+                       other.end)
+
+        raise NotImplementedError("UTN")
+
 
 class RN(HelperWithPos):
     """
@@ -840,9 +892,19 @@ class BaseNodeParser(BaseParser):
         :return:
         """
         from core.sheerka.services.SheerkaConceptManager import SheerkaConceptManager
-        concepts_by_first_keyword = SheerkaConceptManager.compute_concepts_by_first_token(context, concepts).body
-        resolved = SheerkaConceptManager.resolve_concepts_by_first_keyword(context, concepts_by_first_keyword).body
+        service = context.sheerka.services[SheerkaConceptManager.NAME]
+        by_token, by_regex = SheerkaConceptManager.compute_concepts_by_first_item(context, concepts).body
 
+        context.sheerka.om.put(SheerkaConceptManager.CONCEPTS_BY_REGEX_ENTRY,
+                               False,
+                               {k.serialize(): v for k, v in by_regex.items()})
+        compiled = service.compile_concepts_by_first_regex(context, by_regex).body
+        service.compiled_concepts_by_regex.clear()
+        service.compiled_concepts_by_regex.extend(compiled)
+
+        resolved = SheerkaConceptManager.resolve_concepts_by_first_keyword(context, by_token).body
         context.sheerka.om.put(SheerkaConceptManager.RESOLVED_CONCEPTS_BY_FIRST_KEYWORD_ENTRY,
                                False,
                                resolved)
+
+        return self