Fixes to mypy stubs (Issue lark-parser#561)

chanicpanic · Apr 18, 2020 · f04a216 · f04a216
1 parent 227f5de
commit f04a216
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -16,4 +16,4 @@ jobs:
           python -m pip install --upgrade pip
           pip install mypy
       - name: Lint with mypy
-        run: mypy -m lark_stubs || true
+        run: mypy -p lark-stubs || true
diff --git a/lark_stubs/__init__.pyi → lark-stubs/__init__.pyi b/lark_stubs/__init__.pyi → lark-stubs/__init__.pyi
diff --git a/lark_stubs/exceptions.pyi → lark-stubs/exceptions.pyi b/lark_stubs/exceptions.pyi → lark-stubs/exceptions.pyi
diff --git a/lark_stubs/indenter.pyi → lark-stubs/indenter.pyi b/lark_stubs/indenter.pyi → lark-stubs/indenter.pyi
diff --git a/lark_stubs/lark.pyi → lark-stubs/lark.pyi b/lark_stubs/lark.pyi → lark-stubs/lark.pyi
@@ -9,11 +9,6 @@ from .lexer import Token, Lexer, TerminalDef
 from .tree import Tree
 
 _T = TypeVar('_T')
-_Start = Union[None, str, List[str]]
-_Parser = Literal["earley", "lalr", "cyk"]
-_Lexer = Union[Literal["auto", "standard", "contextual", "dynamic", "dynamic_complete"], Lexer]
-_Ambiguity = Literal["explicit", "resolve"]
-
 
 class PostLex(Protocol):
 
@@ -22,12 +17,12 @@ class PostLex(Protocol):
 
 
 class LarkOptions:
-    start: _Start
-    parser: _Parser
-    lexer: _Lexer
+    start: List[str]
+    parser: str
+    lexer: str
     transformer: Optional[Transformer]
     postlex: Optional[PostLex]
-    ambiguity: _Ambiguity
+    ambiguity: str
     debug: bool
     keep_all_tokens: bool
     propagate_positions: bool
@@ -47,12 +42,12 @@ class Lark:
         self,
         grammar: Union[str, IO[str]],
         *,
-        start: _Start = ...,
-        parser: _Parser = ...,
-        lexer: _Lexer = ...,
+        start: Union[None, str, List[str]] = "start",
+        parser: Literal["earley", "lalr", "cyk"] = "auto",
+        lexer: Union[Literal["auto", "standard", "contextual", "dynamic", "dynamic_complete"], Lexer] = "auto",
         transformer: Optional[Transformer] = None,
         postlex: Optional[PostLex] = None,
-        ambiguity: _Ambiguity = ...,
+        ambiguity: Literal["explicit", "resolve"] = "resolve",
         debug: bool = False,
         keep_all_tokens: bool = False,
         propagate_positions: bool = False,
@@ -62,7 +57,7 @@ class Lark:
     ):
         ...
 
-    def parse(self, text: str, start: _Start = None) -> Tree:
+    def parse(self, text: str, start: Optional[str] = None) -> Tree:
         ...
 
     @classmethod

diff --git a/lark_stubs/lexer.pyi → lark-stubs/lexer.pyi b/lark_stubs/lexer.pyi → lark-stubs/lexer.pyi
diff --git a/lark_stubs/reconstruct.pyi → lark-stubs/reconstruct.pyi b/lark_stubs/reconstruct.pyi → lark-stubs/reconstruct.pyi
diff --git a/lark_stubs/tree.pyi → lark-stubs/tree.pyi b/lark_stubs/tree.pyi → lark-stubs/tree.pyi
diff --git a/lark_stubs/visitors.pyi → lark-stubs/visitors.pyi b/lark_stubs/visitors.pyi → lark-stubs/visitors.pyi
diff --git a/setup.py b/setup.py
@@ -6,12 +6,12 @@
 setup(
     name = "lark-parser",
     version = __version__,
-    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark_stubs'],
+    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark-stubs'],
 
     requires = [],
     install_requires = [],
 
-    package_data = {'': ['*.md', '*.lark'], 'lark_stubs': ['*.pyi']},
+    package_data = {'': ['*.md', '*.lark'], 'lark-stubs': ['*.pyi']},
 
     test_suite = 'tests.__main__',