From dc2ec4b3e1edffce14bd2d9ab5265e6df4bade25 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:29:44 -0400
Subject: [PATCH 01/13] refactor: update parsimonious to 0.10.0

---
 stubs/parsimonious/METADATA.toml              |  2 +-
 stubs/parsimonious/parsimonious/__init__.pyi  |  7 ++--
 .../parsimonious/parsimonious/exceptions.pyi  |  5 ++-
 .../parsimonious/parsimonious/expressions.pyi | 39 +++++++++++++------
 stubs/parsimonious/parsimonious/grammar.pyi   | 26 +++++++------
 stubs/parsimonious/parsimonious/nodes.pyi     |  3 +-
 6 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/stubs/parsimonious/METADATA.toml b/stubs/parsimonious/METADATA.toml
index 51e869b47983..5c7ed21e8ad5 100644
--- a/stubs/parsimonious/METADATA.toml
+++ b/stubs/parsimonious/METADATA.toml
@@ -1 +1 @@
-version = "0.9.*"
+version = "0.10.*"
diff --git a/stubs/parsimonious/parsimonious/__init__.pyi b/stubs/parsimonious/parsimonious/__init__.pyi
index 31f99b479767..d20e6a315608 100644
--- a/stubs/parsimonious/parsimonious/__init__.pyi
+++ b/stubs/parsimonious/parsimonious/__init__.pyi
@@ -1,8 +1,9 @@
 from parsimonious.exceptions import (
-    BadGrammar as BadGrammar,
-    IncompleteParseError as IncompleteParseError,
     ParseError as ParseError,
+    IncompleteParseError as IncompleteParseError,
+    VisitationError as VisitationError,
     UndefinedLabel as UndefinedLabel,
+    BadGrammar as BadGrammer,
 )
-from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammar
+from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammer
 from parsimonious.nodes import NodeVisitor as NodeVisitor, VisitationError as VisitationError, rule as rule
diff --git a/stubs/parsimonious/parsimonious/exceptions.pyi b/stubs/parsimonious/parsimonious/exceptions.pyi
index 243b0a4589a8..46d986156713 100644
--- a/stubs/parsimonious/parsimonious/exceptions.pyi
+++ b/stubs/parsimonious/parsimonious/exceptions.pyi
@@ -1,16 +1,18 @@
-from parsimonious.expressions import Expression
 from parsimonious.grammar import LazyReference
 from parsimonious.nodes import Node
+from parsimonious.expressions import Expression
 from parsimonious.utils import StrAndRepr
 
 class ParseError(StrAndRepr, Exception):
     text: str
     pos: int
     expr: Expression | None
+
     def __init__(self, text: str, pos: int = ..., expr: Expression | None = ...) -> None: ...
     def line(self) -> int: ...
     def column(self) -> int: ...
 
+class LeftRecursionError(ParseError): ...
 class IncompleteParseError(ParseError): ...
 
 class VisitationError(Exception):
@@ -21,4 +23,5 @@ class BadGrammar(StrAndRepr, Exception): ...
 
 class UndefinedLabel(BadGrammar):
     label: LazyReference
+
     def __init__(self, label: LazyReference) -> None: ...
diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index a6dbc314bc96..5b471e36c345 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -1,15 +1,13 @@
-import collections.abc
 from collections.abc import Callable, Mapping
+import collections.abc
 from re import Pattern
-from typing import Any, Union
-from typing_extensions import TypeAlias
 
 from parsimonious.exceptions import ParseError
-from parsimonious.grammar import Grammar
 from parsimonious.nodes import Node
+from parsimonious.grammar import Grammar
 from parsimonious.utils import StrAndRepr
-
-MARKER: Any
+from typing import Any, Union
+from typing_extensions import TypeAlias, Self
 
 _CALLABLE_RETURN_TYPE: TypeAlias = Union[int, tuple[int, list[Node]], Node, None]
 _CALLABLE_TYPE: TypeAlias = (
@@ -17,12 +15,17 @@ _CALLABLE_TYPE: TypeAlias = (
     | Callable[[str, int, Mapping[tuple[int, int], Node], ParseError, Grammar], _CALLABLE_RETURN_TYPE]
 )
 
+def is_callable(value: object) -> bool: ...
 def expression(callable: _CALLABLE_TYPE, rule_name: str, grammar: Grammar) -> Expression: ...
 
+IN_PROGRESS: object
+
 class Expression(StrAndRepr):
     name: str
     identity_tuple: tuple[str]
+
     def __init__(self, name: str = ...) -> None: ...
+    def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Self: ...
     def parse(self, text: str, pos: int = ...) -> Node: ...
     def match(self, text: str, pos: int = ...) -> Node: ...
     def match_core(self, text: str, pos: int, cache: Mapping[tuple[int, int], Node], error: ParseError) -> Node: ...
@@ -31,6 +34,7 @@ class Expression(StrAndRepr):
 class Literal(Expression):
     literal: str
     identity_tuple: tuple[str, str]  # type: ignore[assignment]
+
     def __init__(self, literal: str, name: str = ...) -> None: ...
 
 class TokenMatcher(Literal): ...
@@ -53,15 +57,26 @@ class Regex(Expression):
 
 class Compound(Expression):
     members: collections.abc.Sequence[Expression]
+
     def __init__(self, *members: Expression, **kwargs: Any) -> None: ...
+    def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Self: ...
 
 class Sequence(Compound): ...
 class OneOf(Compound): ...
-class Lookahead(Compound): ...
-class Not(Compound): ...
-class Optional(Compound): ...
-class ZeroOrMore(Compound): ...
 
-class OneOrMore(Compound):
+class Lookahead(Compound):
+    negativity: bool
+
+    def __init__(self, member: Expression, *, negative: bool = ..., **kwargs: Any) -> None: ...
+
+def Not(term: Expression) -> Lookahead: ...
+
+class Quantifier(Compound):
     min: int
-    def __init__(self, member: Expression, name: str = ..., min: int = ...) -> None: ...
+    max = float
+
+    def __init__(self, member: Expression, *, min: int = ..., max: float = ..., name: str = ..., **kwargs: Any) -> None: ...
+
+def ZeroOrMore(member: Expression, name: str = ...) -> Quantifier: ...
+def OneOrMore(member: Expression, name: str = ..., min: int = ...) -> Quantifier: ...
+def Optional(member: Expression, name: str = ...) -> Quantifier: ...
diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index a302df492135..8d829c9d1872 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -2,6 +2,7 @@ import collections.abc
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn
+from typing_extensions import Self
 
 from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, Not, OneOf, Regex, Sequence, TokenMatcher
 from parsimonious.nodes import Node, NodeVisitor
@@ -20,6 +21,7 @@ rule_syntax: str
 
 class LazyReference(str):
     name: str
+    def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Expression: ...
 
 class RuleVisitor(NodeVisitor):
     quantifier_classes: dict[str, type[Expression]]
@@ -28,24 +30,24 @@ class RuleVisitor(NodeVisitor):
     visit_atom: Callable[[RuleVisitor, Node, collections.abc.Sequence[Any]], Any]
     custom_rules: dict[str, Expression]
     def __init__(self, custom_rules: Mapping[str, Expression] | None = ...) -> None: ...
-    def visit_rules(
-        self, node: Node, rules_list: collections.abc.Sequence[Any]
-    ) -> tuple[OrderedDict[str, Expression], Expression | None]: ...
+    def visit_parenthesized(self, node: Node, parenthesized: collections.abc.Sequence[Any]) -> Expression: ...
+    def visit_quantifier(self, node: Node, quantifier: collections.abc.Sequence[Any]) -> Node: ...
+    def visit_quantified(self, node: Node, quantified: collections.abc.Sequence[Any]) -> Expression: ...
+    def visit_lookahead_term(self, node: Node, lookahead_term: collections.abc.Sequence[Any]) -> Lookahead: ...
+    def visit_not_term(self, node: Node, not_term: collections.abc.Sequence[Any]) -> Not: ...
     def visit_rule(self, node: Node, rule: collections.abc.Sequence[Any]) -> Expression: ...
-    def visit_label(self, node: Node, label: collections.abc.Sequence[Any]) -> str: ...
+    def visit_sequence(self, node: Node, sequence: collections.abc.Sequence[Any]) -> Sequence: ...
     def visit_ored(self, node: Node, ored: collections.abc.Sequence[Any]) -> OneOf: ...
     def visit_or_term(self, node: Node, or_term: collections.abc.Sequence[Any]) -> Expression: ...
-    def visit_sequence(self, node: Node, sequence: collections.abc.Sequence[Any]) -> Sequence: ...
-    def visit_not_term(self, node: Node, not_term: collections.abc.Sequence[Any]) -> Not: ...
-    def visit_lookahead_term(self, node: Node, lookahead_term: collections.abc.Sequence[Any]) -> Lookahead: ...
-    def visit_quantified(self, node: Node, quantified: collections.abc.Sequence[Any]) -> Expression: ...
-    def visit_quantifier(self, node: Node, quantifier: collections.abc.Sequence[Any]) -> Node: ...
+    def visit_label(self, node: Node, label: collections.abc.Sequence[Any]) -> str: ...
     def visit_reference(self, node: Node, reference: collections.abc.Sequence[Any]) -> LazyReference: ...
-    def visit_literal(self, node: Node, literal: collections.abc.Sequence[Any]) -> Literal: ...
-    def visit_spaceless_literal(self, spaceless_literal: Node, visited_children: collections.abc.Sequence[Any]) -> Literal: ...
     def visit_regex(self, node: Node, regex: collections.abc.Sequence[Any]) -> Regex: ...
-    def visit_parenthesized(self, node: Node, parenthesized: collections.abc.Sequence[Any]) -> Expression: ...
+    def visit_spaceless_literal(self, spaceless_literal: Node, visited_children: collections.abc.Sequence[Any]) -> Literal: ...
+    def visit_literal(self, node: Node, literal: collections.abc.Sequence[Any]) -> Literal: ...
     def generic_visit(self, node: Node, visited_children: collections.abc.Sequence[Any]) -> collections.abc.Sequence[Any] | Node: ...  # type: ignore[override]
+    def visit_rules(
+        self, node: Node, rules_list: collections.abc.Sequence[Any]
+    ) -> tuple[OrderedDict[str, Expression], Expression | None]: ...
 
 class TokenRuleVisitor(RuleVisitor):
     def visit_spaceless_literal(
diff --git a/stubs/parsimonious/parsimonious/nodes.pyi b/stubs/parsimonious/parsimonious/nodes.pyi
index 15cfb6b64b4b..cffd15569870 100644
--- a/stubs/parsimonious/parsimonious/nodes.pyi
+++ b/stubs/parsimonious/parsimonious/nodes.pyi
@@ -19,6 +19,7 @@ class Node:
     @property
     def text(self) -> str: ...
     def prettily(self, error: Node | None = ...) -> str: ...
+    def __repr__(self, top_level: bool = ...) -> str: ...
 
 class RegexNode(Node):
     match: Match[str]
@@ -27,7 +28,7 @@ class RuleDecoratorMeta(type): ...
 
 class NodeVisitor(metaclass=RuleDecoratorMeta):
     grammar: Grammar | Any
-    unwrapped_exceptions: tuple[type[Exception], ...]
+    unwrapped_exceptions: tuple[type[BaseException], ...]
     def visit(self, node: Node) -> Any: ...
     def generic_visit(self, node: Node, visited_children: Sequence[Any]) -> NoReturn: ...
     def parse(self, text: str, pos: int = ...) -> Node: ...

From a95424fef32866c7c616041fa9c807136df49e25 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:31:24 +0000
Subject: [PATCH 02/13] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stubs/parsimonious/parsimonious/__init__.pyi    | 6 +++---
 stubs/parsimonious/parsimonious/exceptions.pyi  | 2 +-
 stubs/parsimonious/parsimonious/expressions.pyi | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/__init__.pyi b/stubs/parsimonious/parsimonious/__init__.pyi
index d20e6a315608..38d51ece6585 100644
--- a/stubs/parsimonious/parsimonious/__init__.pyi
+++ b/stubs/parsimonious/parsimonious/__init__.pyi
@@ -1,9 +1,9 @@
 from parsimonious.exceptions import (
-    ParseError as ParseError,
+    BadGrammar as BadGrammer,
     IncompleteParseError as IncompleteParseError,
-    VisitationError as VisitationError,
+    ParseError as ParseError,
     UndefinedLabel as UndefinedLabel,
-    BadGrammar as BadGrammer,
+    VisitationError as VisitationError,
 )
 from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammer
 from parsimonious.nodes import NodeVisitor as NodeVisitor, VisitationError as VisitationError, rule as rule
diff --git a/stubs/parsimonious/parsimonious/exceptions.pyi b/stubs/parsimonious/parsimonious/exceptions.pyi
index 46d986156713..1a4353ca3256 100644
--- a/stubs/parsimonious/parsimonious/exceptions.pyi
+++ b/stubs/parsimonious/parsimonious/exceptions.pyi
@@ -1,6 +1,6 @@
+from parsimonious.expressions import Expression
 from parsimonious.grammar import LazyReference
 from parsimonious.nodes import Node
-from parsimonious.expressions import Expression
 from parsimonious.utils import StrAndRepr
 
 class ParseError(StrAndRepr, Exception):
diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index 5b471e36c345..f2059a224e29 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -1,13 +1,13 @@
-from collections.abc import Callable, Mapping
 import collections.abc
+from collections.abc import Callable, Mapping
 from re import Pattern
+from typing import Any, Union
+from typing_extensions import Self, TypeAlias
 
 from parsimonious.exceptions import ParseError
-from parsimonious.nodes import Node
 from parsimonious.grammar import Grammar
+from parsimonious.nodes import Node
 from parsimonious.utils import StrAndRepr
-from typing import Any, Union
-from typing_extensions import TypeAlias, Self
 
 _CALLABLE_RETURN_TYPE: TypeAlias = Union[int, tuple[int, list[Node]], Node, None]
 _CALLABLE_TYPE: TypeAlias = (

From 9bd8ea3ab10f5055936b1ac08af5c825e5f77e0b Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:33:14 -0400
Subject: [PATCH 03/13] use self from _typeshed instead of typing_extensions

---
 stubs/parsimonious/parsimonious/expressions.pyi | 3 ++-
 stubs/parsimonious/parsimonious/grammar.pyi     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index f2059a224e29..81e775287684 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -2,7 +2,8 @@ import collections.abc
 from collections.abc import Callable, Mapping
 from re import Pattern
 from typing import Any, Union
-from typing_extensions import Self, TypeAlias
+from _typeshed import Self
+from typing_extensions import TypeAlias
 
 from parsimonious.exceptions import ParseError
 from parsimonious.grammar import Grammar
diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index 8d829c9d1872..c30d5f47d6c2 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -2,7 +2,7 @@ import collections.abc
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn
-from typing_extensions import Self
+from _typeshed import Self
 
 from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, Not, OneOf, Regex, Sequence, TokenMatcher
 from parsimonious.nodes import Node, NodeVisitor

From 5d8a1c43f886f2becf949090ca5e2cd8e1b71631 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:35:59 -0400
Subject: [PATCH 04/13] fix: unnecessary stub

---
 stubs/parsimonious/parsimonious/grammar.pyi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index c30d5f47d6c2..389cbbb5cb10 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -2,7 +2,6 @@ import collections.abc
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn
-from _typeshed import Self
 
 from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, Not, OneOf, Regex, Sequence, TokenMatcher
 from parsimonious.nodes import Node, NodeVisitor
@@ -21,7 +20,7 @@ rule_syntax: str
 
 class LazyReference(str):
     name: str
-    def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Expression: ...
+    def resolve_refs(self, rule_map: Mapping[str, Expression]) -> Expression: ...
 
 class RuleVisitor(NodeVisitor):
     quantifier_classes: dict[str, type[Expression]]

From b340628e8a651d181dcca6536c19fc13cad3adff Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:36:30 +0000
Subject: [PATCH 05/13] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stubs/parsimonious/parsimonious/expressions.pyi | 2 +-
 stubs/parsimonious/parsimonious/grammar.pyi     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index 81e775287684..7caaa3711604 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -1,8 +1,8 @@
 import collections.abc
+from _typeshed import Self
 from collections.abc import Callable, Mapping
 from re import Pattern
 from typing import Any, Union
-from _typeshed import Self
 from typing_extensions import TypeAlias
 
 from parsimonious.exceptions import ParseError
diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index 389cbbb5cb10..c750beebbb52 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -1,4 +1,5 @@
 import collections.abc
+from _typeshed import Self
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn

From 22b648874cb51f1884db3b66a13f9d0c77bd4411 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:38:56 -0400
Subject: [PATCH 06/13] fix: remove unused import after removing unnecessary
 :Self type

---
 stubs/parsimonious/parsimonious/grammar.pyi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index c750beebbb52..389cbbb5cb10 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -1,5 +1,4 @@
 import collections.abc
-from _typeshed import Self
 from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn

From 84831f5ba92968e37f8cc80dc02406b482707f71 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:42:59 -0400
Subject: [PATCH 07/13] fix: move from Not type to Not as a factory

---
 stubs/parsimonious/parsimonious/grammar.pyi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index 389cbbb5cb10..9961bc456af2 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -33,7 +33,7 @@ class RuleVisitor(NodeVisitor):
     def visit_quantifier(self, node: Node, quantifier: collections.abc.Sequence[Any]) -> Node: ...
     def visit_quantified(self, node: Node, quantified: collections.abc.Sequence[Any]) -> Expression: ...
     def visit_lookahead_term(self, node: Node, lookahead_term: collections.abc.Sequence[Any]) -> Lookahead: ...
-    def visit_not_term(self, node: Node, not_term: collections.abc.Sequence[Any]) -> Not: ...
+    def visit_not_term(self, node: Node, not_term: collections.abc.Sequence[Any]) -> Lookahead: ...
     def visit_rule(self, node: Node, rule: collections.abc.Sequence[Any]) -> Expression: ...
     def visit_sequence(self, node: Node, sequence: collections.abc.Sequence[Any]) -> Sequence: ...
     def visit_ored(self, node: Node, ored: collections.abc.Sequence[Any]) -> OneOf: ...

From bd3582a80b34a5f3ed011768750853a600db56b0 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:44:31 +0000
Subject: [PATCH 08/13] [pre-commit.ci] auto fixes from pre-commit.com hooks

---
 stubs/parsimonious/parsimonious/grammar.pyi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index 9961bc456af2..d0d44ddb6f2b 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -3,7 +3,7 @@ from collections import OrderedDict
 from collections.abc import Callable, Mapping
 from typing import Any, NoReturn
 
-from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, Not, OneOf, Regex, Sequence, TokenMatcher
+from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, OneOf, Regex, Sequence, TokenMatcher
 from parsimonious.nodes import Node, NodeVisitor
 
 class Grammar(OrderedDict[str, Expression]):

From 6ea0aab970698160a78b5ceb705d8ac7f059508f Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:45:15 -0400
Subject: [PATCH 09/13] fix: remove allowlist entry based on test results

---
 stubs/parsimonious/@tests/stubtest_allowlist.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stubs/parsimonious/@tests/stubtest_allowlist.txt b/stubs/parsimonious/@tests/stubtest_allowlist.txt
index ce8bec20df65..0da166241c76 100644
--- a/stubs/parsimonious/@tests/stubtest_allowlist.txt
+++ b/stubs/parsimonious/@tests/stubtest_allowlist.txt
@@ -1,2 +1 @@
-parsimonious.nodes.Node.__repr__
 parsimonious.nodes.RuleDecoratorMeta.__new__

From f81a2ad3d375a22fd9b4549da723ee1aea079bed Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:48:57 -0400
Subject: [PATCH 10/13] use the instance of VisitationError from nodes

---
 stubs/parsimonious/parsimonious/__init__.pyi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stubs/parsimonious/parsimonious/__init__.pyi b/stubs/parsimonious/parsimonious/__init__.pyi
index 38d51ece6585..af9eeb03f7ec 100644
--- a/stubs/parsimonious/parsimonious/__init__.pyi
+++ b/stubs/parsimonious/parsimonious/__init__.pyi
@@ -3,7 +3,6 @@ from parsimonious.exceptions import (
     IncompleteParseError as IncompleteParseError,
     ParseError as ParseError,
     UndefinedLabel as UndefinedLabel,
-    VisitationError as VisitationError,
 )
 from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammer
 from parsimonious.nodes import NodeVisitor as NodeVisitor, VisitationError as VisitationError, rule as rule

From ac5bb9d794811d0e17b573a36368f98638457d40 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Mon, 12 Sep 2022 12:53:55 -0400
Subject: [PATCH 11/13] fix: spelling

---
 stubs/parsimonious/parsimonious/__init__.pyi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/__init__.pyi b/stubs/parsimonious/parsimonious/__init__.pyi
index af9eeb03f7ec..31f99b479767 100644
--- a/stubs/parsimonious/parsimonious/__init__.pyi
+++ b/stubs/parsimonious/parsimonious/__init__.pyi
@@ -1,8 +1,8 @@
 from parsimonious.exceptions import (
-    BadGrammar as BadGrammer,
+    BadGrammar as BadGrammar,
     IncompleteParseError as IncompleteParseError,
     ParseError as ParseError,
     UndefinedLabel as UndefinedLabel,
 )
-from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammer
+from parsimonious.grammar import Grammar as Grammar, TokenGrammar as TokenGrammar
 from parsimonious.nodes import NodeVisitor as NodeVisitor, VisitationError as VisitationError, rule as rule

From e605080a8dedac3ead02b2fb20ea221c18b847e6 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Tue, 13 Sep 2022 09:45:36 -0400
Subject: [PATCH 12/13] fix first set of feedback

---
 stubs/parsimonious/parsimonious/exceptions.pyi  | 2 --
 stubs/parsimonious/parsimonious/expressions.pyi | 3 +--
 stubs/parsimonious/parsimonious/grammar.pyi     | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/exceptions.pyi b/stubs/parsimonious/parsimonious/exceptions.pyi
index 1a4353ca3256..9401ce5f8d76 100644
--- a/stubs/parsimonious/parsimonious/exceptions.pyi
+++ b/stubs/parsimonious/parsimonious/exceptions.pyi
@@ -7,7 +7,6 @@ class ParseError(StrAndRepr, Exception):
     text: str
     pos: int
     expr: Expression | None
-
     def __init__(self, text: str, pos: int = ..., expr: Expression | None = ...) -> None: ...
     def line(self) -> int: ...
     def column(self) -> int: ...
@@ -23,5 +22,4 @@ class BadGrammar(StrAndRepr, Exception): ...
 
 class UndefinedLabel(BadGrammar):
     label: LazyReference
-
     def __init__(self, label: LazyReference) -> None: ...
diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index 7caaa3711604..7424887c37a7 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -60,7 +60,6 @@ class Compound(Expression):
     members: collections.abc.Sequence[Expression]
 
     def __init__(self, *members: Expression, **kwargs: Any) -> None: ...
-    def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Self: ...
 
 class Sequence(Compound): ...
 class OneOf(Compound): ...
@@ -74,7 +73,7 @@ def Not(term: Expression) -> Lookahead: ...
 
 class Quantifier(Compound):
     min: int
-    max = float
+    max: float
 
     def __init__(self, member: Expression, *, min: int = ..., max: float = ..., name: str = ..., **kwargs: Any) -> None: ...
 
diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi
index d0d44ddb6f2b..f686df326c65 100644
--- a/stubs/parsimonious/parsimonious/grammar.pyi
+++ b/stubs/parsimonious/parsimonious/grammar.pyi
@@ -20,7 +20,7 @@ rule_syntax: str
 
 class LazyReference(str):
     name: str
-    def resolve_refs(self, rule_map: Mapping[str, Expression]) -> Expression: ...
+    def resolve_refs(self, rule_map: Mapping[str, Expression | LazyReference]) -> Expression: ...
 
 class RuleVisitor(NodeVisitor):
     quantifier_classes: dict[str, type[Expression]]

From 60424ebe97524858cb0be0c4de78f68460ae4dc5 Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Tue, 13 Sep 2022 09:47:08 -0400
Subject: [PATCH 13/13] remove newlines because they dont want segmented stub

---
 stubs/parsimonious/parsimonious/expressions.pyi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi
index 7424887c37a7..fdc50b071c7d 100644
--- a/stubs/parsimonious/parsimonious/expressions.pyi
+++ b/stubs/parsimonious/parsimonious/expressions.pyi
@@ -24,7 +24,6 @@ IN_PROGRESS: object
 class Expression(StrAndRepr):
     name: str
     identity_tuple: tuple[str]
-
     def __init__(self, name: str = ...) -> None: ...
     def resolve_refs(self: Self, rule_map: Mapping[str, Expression]) -> Self: ...
     def parse(self, text: str, pos: int = ...) -> Node: ...
@@ -35,7 +34,6 @@ class Expression(StrAndRepr):
 class Literal(Expression):
     literal: str
     identity_tuple: tuple[str, str]  # type: ignore[assignment]
-
     def __init__(self, literal: str, name: str = ...) -> None: ...
 
 class TokenMatcher(Literal): ...
@@ -58,7 +56,6 @@ class Regex(Expression):
 
 class Compound(Expression):
     members: collections.abc.Sequence[Expression]
-
     def __init__(self, *members: Expression, **kwargs: Any) -> None: ...
 
 class Sequence(Compound): ...
@@ -66,7 +63,6 @@ class OneOf(Compound): ...
 
 class Lookahead(Compound):
     negativity: bool
-
     def __init__(self, member: Expression, *, negative: bool = ..., **kwargs: Any) -> None: ...
 
 def Not(term: Expression) -> Lookahead: ...
@@ -74,7 +70,6 @@ def Not(term: Expression) -> Lookahead: ...
 class Quantifier(Compound):
     min: int
     max: float
-
     def __init__(self, member: Expression, *, min: int = ..., max: float = ..., name: str = ..., **kwargs: Any) -> None: ...
 
 def ZeroOrMore(member: Expression, name: str = ...) -> Quantifier: ...