Fixes according to review notes (more accurate type for tree_class)

lark-parser · Sep 25, 2023 · 41c28d4 · 41c28d4
1 parent b8b69c7
commit 41c28d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lark/lark.py b/lark/lark.py
@@ -62,7 +62,7 @@ class LarkOptions(Serialize):
     regex: bool
     g_regex_flags: int
     keep_all_tokens: bool
-    tree_class: Optional[Callable[[str, Sequence], Any]]
+    tree_class: Optional[Callable[[str, List], Any]]
     parser: _ParserArgType
     lexer: _LexerArgType
     ambiguity: 'Literal["auto", "resolve", "explicit", "forest"]'

diff --git a/lark/parsers/earley.py b/lark/parsers/earley.py
@@ -9,7 +9,7 @@
 is explained here: https://lark-parser.readthedocs.io/en/latest/_static/sppf/sppf.html
 """
 
-from typing import TYPE_CHECKING, Callable, Optional, Sequence, Any
+from typing import TYPE_CHECKING, Callable, Optional, List, Any
 from collections import deque
 
 from ..lexer import Token
@@ -31,7 +31,7 @@ class Parser:
 
     def __init__(self, lexer_conf: 'LexerConf', parser_conf: 'ParserConf', term_matcher: Callable,
                  resolve_ambiguity: bool=True, debug: bool=False,
-                 tree_class: Optional[type]=Tree, ordered_sets: bool=True):
+                 tree_class: Optional[Callable[[str, List], Any]]=Tree, ordered_sets: bool=True):
         analysis = GrammarAnalyzer(parser_conf)
         self.lexer_conf = lexer_conf
         self.parser_conf = parser_conf

diff --git a/lark/parsers/xearley.py b/lark/parsers/xearley.py
@@ -14,7 +14,7 @@
 Earley's power in parsing any CFG.
 """
 
-from typing import TYPE_CHECKING, Callable, Optional, Sequence, Any
+from typing import TYPE_CHECKING, Callable, Optional, List, Any
 from collections import defaultdict
 
 from ..tree import Tree
@@ -30,7 +30,7 @@
 class Parser(BaseParser):
     def __init__(self, lexer_conf: 'LexerConf', parser_conf: 'ParserConf', term_matcher: Callable,
                  resolve_ambiguity: bool=True, complete_lex: bool=False, debug: bool=False,
-                 tree_class: Optional[type]=Tree, ordered_sets: bool=True):
+                 tree_class: Optional[Callable[[str, List], Any]]=Tree, ordered_sets: bool=True):
         BaseParser.__init__(self, lexer_conf, parser_conf, term_matcher, resolve_ambiguity,
                             debug, tree_class, ordered_sets)
         self.ignore = [Terminal(t) for t in lexer_conf.ignore]