Fix unpickling when compiled with newer mypycs

parsing/ast.py

@@ -7,7 +7,10 @@
 
 from __future__ import annotations
 
+from mypy_extensions import mypyc_attr
 
+
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class Symbol:
     pass
 

parsing/automaton.py

@@ -15,6 +15,7 @@
     Tuple,
     Type,
 )
+from mypy_extensions import mypyc_attr
 
 import collections
 import inspect
@@ -97,6 +98,7 @@ def computeFirstSet(s: Tuple[SymbolSpec, ...]) -> frozenset[SymbolSpec]:
     return firstSet
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class ItemSet:
     def __init__(self, items: Iterable[Tuple[Item, set[SymbolSpec]]]) -> None:
         self._kernel: Dict[Item, set[SymbolSpec]] = {}
@@ -216,9 +218,9 @@ def closure(self) -> None:
     def goto(self, sym: SymbolSpec) -> ItemSet | None:
         items = self._symMap.get(sym)
         if items:
-            return ItemSet(
+            return ItemSet([
                 (i.production.item(i.dotPos + 1), self._all[i]) for i in items
-            )
+            ])
         else:
             return None
 
@@ -274,6 +276,7 @@ def weakCompat(self, other: ItemSet) -> bool:
         return True
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class Spec(interfaces.Spec):
     """
     The Spec class contains the read-only data structures that the Parser

parsing/grammar.py

@@ -38,6 +38,8 @@
     Type,
 )
 
+from mypy_extensions import mypyc_attr
+
 import re
 import sys
 from parsing.ast import Token, Nonterm
@@ -48,6 +50,7 @@
     import types
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class PrecedenceSpec:
     assoc_tok_re: ClassVar[re.Pattern[str]] = re.compile(
         r"([<>=])([A-Za-z]\w*)"
@@ -83,11 +86,13 @@ def __repr__(self) -> str:
         )
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class PrecedenceRef(PrecedenceSpec):
     def __init__(self, name: str) -> None:
         super().__init__(name, "fail", {})
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class SymbolSpec:
     name: str
     prec: PrecedenceSpec
@@ -122,6 +127,7 @@ def followSetMerge(self, set: Iterable[SymbolSpec]) -> bool:
         return ret
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class NontermSpec(SymbolSpec):
     token_re: ClassVar[re.Pattern[str]] = re.compile(r"([A-Za-z]\w*)")
     precedence_tok_re: ClassVar[re.Pattern[str]] = re.compile(
@@ -193,6 +199,7 @@ def from_class(
 
 
 # AKA terminal symbol.
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class TokenSpec(SymbolSpec):
     def __init__(
         self,
@@ -204,6 +211,7 @@ def __init__(
         self.tokenType = tokenType
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class Item:
     production: Production
     dotPos: int
@@ -260,6 +268,7 @@ def lr0__repr__(self) -> str:
 _item_cache: dict[tuple[Production, int], Item] = {}
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class Production:
     def __init__(
         self,
@@ -347,6 +356,7 @@ def reduce(self, userStartSym: SymbolSpec, eoi: EndOfInputSpec) -> None:
         pass
 
 
+@mypyc_attr(serializable=True, allow_interpreted_subclasses=True)
 class Action:
     """
     Abstract base class, subclassed by {Shift,Reduce}Action."""

setup.py

@@ -27,7 +27,7 @@
 
 
 USE_MYPYC = False
-MYPY_DEPENDENCY = "mypy>=0.910"
+MYPY_DEPENDENCY = "mypy>=1.4.1"
 setup_requires = []
 ext_modules = []