WIP

Author: lagru

src/docstub/_doctype.py

@@ -1,8 +1,8 @@
 """Parsing of doctypes."""
 
 import enum
-import logging
 import keyword
+import logging
 from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
@@ -14,7 +14,6 @@
 
 from ._utils import DocstubError
 
-
 logger: Final = logging.getLogger(__name__)
 
 
@@ -25,7 +24,7 @@
 
 # TODO try passing `transformer=DoctypeTransformer()`, may be faster [1]
 # [1] https://lark-parser.readthedocs.io/en/latest/classes.html#:~:text=after%20the%20parse%2C-,but%20faster,-)
-_lark: Final = lark.Lark(_grammar, propagate_positions=True, parser="lalr")
+_lark: Final = lark.Lark(_grammar, propagate_positions=True)
 
 
 def flatten_recursive(iterable):
@@ -83,7 +82,7 @@ class Term(str):
     __slots__ : Final
     """
 
-    __slots__ = ("value", "kind", "pos")
+    __slots__ = ("kind", "pos", "value")
 
     def __new__(cls, value, *, kind, pos=None):
         """

tests/test_doctype.py

@@ -1,10 +1,10 @@
 import logging
 
-import pytest
 import lark
 import lark.exceptions
+import pytest
 
-from docstub._doctype import parse_doctype, Term, TermKind, BLACKLISTED_QUALNAMES
+from docstub._doctype import BLACKLISTED_QUALNAMES, parse_doctype
 
 
 class Test_parse_doctype:
@@ -212,14 +212,8 @@ def test_rst_role(self, doctype, expected):
         ["(2, 3)", "(N, m)", "3D", "2-D", "(N, ...)", "([P,] M, N)"]
      )
     def test_natlang_array(self, fmt, expected_fmt, name, dtype, shape):
-
-        def escape(name: str) -> str:
-            return name.replace("-", "_").replace(".", "_")
-
         doctype = fmt.format(name=name, dtype=dtype, shape=shape)
-        expected = expected_fmt.format(
-            name=escape(name), dtype=escape(dtype), shape=shape
-        )
+        expected = expected_fmt.format(name=name, dtype=dtype, shape=shape)
         expr = parse_doctype(doctype)
         assert expr.as_code() == expected
     # fmt: on
@@ -267,4 +261,3 @@ def test_multiple_unknown_names(self):
             PyImport(import_="Incomplete", from_="_typeshed", as_="c"),
         }
         assert unknown_names == [("a.b", 0, 3), ("c", 7, 8)]
-