]>
git.madduck.net Git - etc/vim.git/blobdiff - blib2to3/pytree.py
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
There's also a pattern matching implementation here.
"""
There's also a pattern matching implementation here.
"""
+# mypy: allow-untyped-defs
+
+from typing import (
+ Any,
+ Callable,
+ Dict,
+ Iterator,
+ List,
+ Optional,
+ Text,
+ Tuple,
+ TypeVar,
+ Union,
+ Set,
+ Iterable,
+ Sequence,
+)
+from blib2to3.pgen2.grammar import Grammar
+
__author__ = "Guido van Rossum <guido@python.org>"
import sys
from io import StringIO
__author__ = "Guido van Rossum <guido@python.org>"
import sys
from io import StringIO
-HUGE = 0x7FFFFFFF # maximum repeat count, default max
+HUGE: int = 0x7FFFFFFF # maximum repeat count, default max
+_type_reprs: Dict[int, Union[Text, int]] = {}
-def type_repr(type_num) :
+def type_repr(type_num: int) -> Union[Text, int] :
global _type_reprs
if not _type_reprs:
from .pygram import python_symbols
# printing tokens is possible but not as useful
# from .pgen2 import token // token.__dict__.items():
global _type_reprs
if not _type_reprs:
from .pygram import python_symbols
# printing tokens is possible but not as useful
# from .pgen2 import token // token.__dict__.items():
- for name, val in python_symbols.__dict__.items():
+ for name in dir(python_symbols):
+ val = getattr(python_symbols, name)
if type(val) == int:
_type_reprs[val] = name
return _type_reprs.setdefault(type_num, type_num)
if type(val) == int:
_type_reprs[val] = name
return _type_reprs.setdefault(type_num, type_num)
+_P = TypeVar("_P")
+
+NL = Union["Node", "Leaf"]
+Context = Tuple[Text, Tuple[int, int]]
+RawNode = Tuple[int, Optional[Text], Optional[Context], Optional[List[NL]]]
+
+
"""
# Default values for instance variables
"""
# Default values for instance variables
- type = None # int: token number (< 256) or symbol number (>= 256)
- parent = None # Parent node pointer, or None
- children = () # Tuple of subnodes
- was_changed = False
- was_checked = False
+ type: int # int: token number (< 256) or symbol number (>= 256)
+ parent: Optional["Node"] = None # Parent node pointer, or None
+ children: List[NL] # List of subnodes
+ was_changed: bool = False
+ was_checked: bool = False
def __new__(cls, *args, **kwds):
"""Constructor that prevents Base from being instantiated."""
assert cls is not Base, "Cannot instantiate Base"
return object.__new__(cls)
def __new__(cls, *args, **kwds):
"""Constructor that prevents Base from being instantiated."""
assert cls is not Base, "Cannot instantiate Base"
return object.__new__(cls)
- def __eq__(self, other) :
+ def __eq__(self, other: Any) -> bool :
"""
Compare two nodes for equality.
"""
Compare two nodes for equality.
return NotImplemented
return self._eq(other)
return NotImplemented
return self._eq(other)
- __hash__ = None # For Py3 compatibility.
+ __hash__ = None # type: Any # For Py3 compatibility.
+
+ @property
+ def prefix(self) -> Text:
+ raise NotImplementedError
+ def _eq(self: _P, other: _P) -> bool :
"""
Compare two nodes for equality.
"""
Compare two nodes for equality.
"""
raise NotImplementedError
"""
raise NotImplementedError
+ def clone(self: _P) -> _P :
"""
Return a cloned (deep) copy of self.
"""
Return a cloned (deep) copy of self.
"""
raise NotImplementedError
"""
raise NotImplementedError
+ def post_order(self) -> Iterator[NL] :
"""
Return a post-order iterator for the tree.
"""
Return a post-order iterator for the tree.
"""
raise NotImplementedError
"""
raise NotImplementedError
+ def pre_order(self) -> Iterator[NL] :
"""
Return a pre-order iterator for the tree.
"""
Return a pre-order iterator for the tree.
"""
raise NotImplementedError
"""
raise NotImplementedError
- def replace(self, new) :
+ def replace(self, new: Union[NL, List[NL]]) -> None :
"""Replace this node with a new one in the parent."""
assert self.parent is not None, str(self)
assert new is not None
"""Replace this node with a new one in the parent."""
assert self.parent is not None, str(self)
assert new is not None
x.parent = self.parent
self.parent = None
x.parent = self.parent
self.parent = None
+ def get_lineno(self) -> Optional[int] :
"""Return the line number which generated the invocant node."""
node = self
while not isinstance(node, Leaf):
if not node.children:
"""Return the line number which generated the invocant node."""
node = self
while not isinstance(node, Leaf):
if not node.children:
node = node.children[0]
return node.lineno
node = node.children[0]
return node.lineno
+ def changed(self) -> None :
if self.was_changed:
return
if self.parent:
self.parent.changed()
self.was_changed = True
if self.was_changed:
return
if self.parent:
self.parent.changed()
self.was_changed = True
+ def remove(self) -> Optional[int] :
"""
Remove the node from the tree. Returns the position of the node in its
parent's children before it was removed.
"""
Remove the node from the tree. Returns the position of the node in its
parent's children before it was removed.
self.parent.invalidate_sibling_maps()
self.parent = None
return i
self.parent.invalidate_sibling_maps()
self.parent = None
return i
- def next_sibling(self):
+ def next_sibling(self) -> Optional[NL] :
"""
The node immediately following the invocant in their parent's children
list. If the invocant does not have a next sibling, it is None
"""
The node immediately following the invocant in their parent's children
list. If the invocant does not have a next sibling, it is None
if self.parent.next_sibling_map is None:
self.parent.update_sibling_maps()
if self.parent.next_sibling_map is None:
self.parent.update_sibling_maps()
+ assert self.parent.next_sibling_map is not None
return self.parent.next_sibling_map[id(self)]
@property
return self.parent.next_sibling_map[id(self)]
@property
- def prev_sibling(self):
+ def prev_sibling(self) -> Optional[NL] :
"""
The node immediately preceding the invocant in their parent's children
list. If the invocant does not have a previous sibling, it is None.
"""
The node immediately preceding the invocant in their parent's children
list. If the invocant does not have a previous sibling, it is None.
if self.parent.prev_sibling_map is None:
self.parent.update_sibling_maps()
if self.parent.prev_sibling_map is None:
self.parent.update_sibling_maps()
+ assert self.parent.prev_sibling_map is not None
return self.parent.prev_sibling_map[id(self)]
return self.parent.prev_sibling_map[id(self)]
+ def leaves(self) -> Iterator["Leaf"] :
for child in self.children:
yield from child.leaves()
for child in self.children:
yield from child.leaves()
+ def depth(self) -> int :
if self.parent is None:
return 0
return 1 + self.parent.depth()
if self.parent is None:
return 0
return 1 + self.parent.depth()
+ def get_suffix(self) -> Text :
"""
Return the string immediately following the invocant node. This is
effectively equivalent to node.next_sibling.prefix
"""
Return the string immediately following the invocant node. This is
effectively equivalent to node.next_sibling.prefix
next_sib = self.next_sibling
if next_sib is None:
return ""
next_sib = self.next_sibling
if next_sib is None:
return ""
- return next_sib.prefix
-
- if sys.version_info < (3, 0):
-
- def __str__(self):
- return str(self).encode("ascii")
+ prefix = next_sib.prefix
+ return prefix
class Node(Base):
"""Concrete implementation for interior nodes."""
class Node(Base):
"""Concrete implementation for interior nodes."""
- def __init__(self, type, children, context=None, prefix=None, fixers_applied=None):
+ fixers_applied: Optional[List[Any]]
+ used_names: Optional[Set[Text]]
+
+ def __init__(
+ self,
+ type: int,
+ children: List[NL],
+ context: Optional[Any] = None,
+ prefix: Optional[Text] = None,
+ fixers_applied: Optional[List[Any]] = None,
+ ) -> None:
else:
self.fixers_applied = None
else:
self.fixers_applied = None
+ def __repr__(self) -> Text :
"""Return a canonical string representation."""
"""Return a canonical string representation."""
+ assert self.type is not None
return "%s(%s, %r)" % (
self.__class__.__name__,
type_repr(self.type),
self.children,
)
return "%s(%s, %r)" % (
self.__class__.__name__,
type_repr(self.type),
self.children,
)
+ def __str__(self) -> Text :
"""
Return a pretty string representation.
"""
Return a pretty string representation.
"""
return "".join(map(str, self.children))
"""
return "".join(map(str, self.children))
- if sys.version_info > (3, 0):
- __str__ = __unicode__
-
- def _eq(self, other):
+ def _eq(self, other) -> bool:
"""Compare two nodes for equality."""
return (self.type, self.children) == (other.type, other.children)
"""Compare two nodes for equality."""
return (self.type, self.children) == (other.type, other.children)
+ def clone(self) -> "Node":
+ assert self.type is not None
"""Return a cloned (deep) copy of self."""
return Node(
self.type,
"""Return a cloned (deep) copy of self."""
return Node(
self.type,
fixers_applied=self.fixers_applied,
)
fixers_applied=self.fixers_applied,
)
+ def post_order(self) -> Iterator[NL] :
"""Return a post-order iterator for the tree."""
for child in self.children:
yield from child.post_order()
yield self
"""Return a post-order iterator for the tree."""
for child in self.children:
yield from child.post_order()
yield self
+ def pre_order(self) -> Iterator[NL] :
"""Return a pre-order iterator for the tree."""
yield self
for child in self.children:
yield from child.pre_order()
@property
"""Return a pre-order iterator for the tree."""
yield self
for child in self.children:
yield from child.pre_order()
@property
+ def prefix(self) -> Text :
"""
The whitespace and comments preceding this node in the input.
"""
"""
The whitespace and comments preceding this node in the input.
"""
return self.children[0].prefix
@prefix.setter
return self.children[0].prefix
@prefix.setter
- def prefix(self, prefix):
+ def prefix(self, prefix) -> None :
if self.children:
self.children[0].prefix = prefix
if self.children:
self.children[0].prefix = prefix
- def set_child(self, i, child) :
+ def set_child(self, i: int, child: NL) -> None :
"""
Equivalent to 'node.children[i] = child'. This method also sets the
child's parent attribute appropriately.
"""
Equivalent to 'node.children[i] = child'. This method also sets the
child's parent attribute appropriately.
self.changed()
self.invalidate_sibling_maps()
self.changed()
self.invalidate_sibling_maps()
- def insert_child(self, i, child) :
+ def insert_child(self, i: int, child: NL) -> None :
"""
Equivalent to 'node.children.insert(i, child)'. This method also sets
the child's parent attribute appropriately.
"""
Equivalent to 'node.children.insert(i, child)'. This method also sets
the child's parent attribute appropriately.
self.changed()
self.invalidate_sibling_maps()
self.changed()
self.invalidate_sibling_maps()
- def append_child(self, child) :
+ def append_child(self, child: NL) -> None :
"""
Equivalent to 'node.children.append(child)'. This method also sets the
child's parent attribute appropriately.
"""
Equivalent to 'node.children.append(child)'. This method also sets the
child's parent attribute appropriately.
self.changed()
self.invalidate_sibling_maps()
self.changed()
self.invalidate_sibling_maps()
- def invalidate_sibling_maps(self):
- self.prev_sibling_map = None
- self.next_sibling_map = None
+ def invalidate_sibling_maps(self) -> None :
+ self.prev_sibling_map: Optional[Dict[int, Optional[NL]]] = None
+ self.next_sibling_map: Optional[Dict[int, Optional[NL]]] = None
- def update_sibling_maps(self):
- self.prev_sibling_map = _prev = {}
- self.next_sibling_map = _next = {}
- previous = None
+ def update_sibling_maps(self) -> None:
+ _prev: Dict[int, Optional[NL]] = {}
+ _next: Dict[int, Optional[NL]] = {}
+ self.prev_sibling_map = _prev
+ self.next_sibling_map = _next
+ previous: Optional[NL] = None
for current in self.children:
_prev[id(current)] = previous
_next[id(previous)] = current
for current in self.children:
_prev[id(current)] = previous
_next[id(previous)] = current
"""Concrete implementation for leaf nodes."""
# Default values for instance variables
"""Concrete implementation for leaf nodes."""
# Default values for instance variables
+ value: Text
+ fixers_applied: List[Any]
+ bracket_depth: int
+ opening_bracket: "Leaf"
+ used_names: Optional[Set[Text]]
_prefix = "" # Whitespace and comments preceding this token in the input
_prefix = "" # Whitespace and comments preceding this token in the input
- lineno = 0 # Line where this token starts in the input
- column = 0 # Column where this token starts in the input
-
- def __init__(self, type, value, context=None, prefix=None, fixers_applied=[]):
+ lineno: int = 0 # Line where this token starts in the input
+ column: int = 0 # Column where this token starts in the input
+
+ def __init__(
+ self,
+ type: int,
+ value: Text,
+ context: Optional[Context] = None,
+ prefix: Optional[Text] = None,
+ fixers_applied: List[Any] = [],
+ ) -> None:
"""
Initializer.
Takes a type constant (a token number < 256), a string value, and an
optional context keyword argument.
"""
"""
Initializer.
Takes a type constant (a token number < 256), a string value, and an
optional context keyword argument.
"""
assert 0 <= type < 256, type
if context is not None:
self._prefix, (self.lineno, self.column) = context
assert 0 <= type < 256, type
if context is not None:
self._prefix, (self.lineno, self.column) = context
self.value = value
if prefix is not None:
self._prefix = prefix
self.value = value
if prefix is not None:
self._prefix = prefix
- self.fixers_applied = fixers_applied[:]
+ self.fixers_applied: Optional[List[Any]] = fixers_applied[:]
+ self.children = []
+ def __repr__(self) -> str :
"""Return a canonical string representation."""
from .pgen2.token import tok_name
"""Return a canonical string representation."""
from .pgen2.token import tok_name
+ assert self.type is not None
return "%s(%s, %r)" % (
self.__class__.__name__,
tok_name.get(self.type, self.type),
self.value,
)
return "%s(%s, %r)" % (
self.__class__.__name__,
tok_name.get(self.type, self.type),
self.value,
)
+ def __str__(self) -> Text :
"""
Return a pretty string representation.
"""
Return a pretty string representation.
"""
return self.prefix + str(self.value)
"""
return self.prefix + str(self.value)
- if sys.version_info > (3, 0):
- __str__ = __unicode__
-
- def _eq(self, other):
+ def _eq(self, other) -> bool:
"""Compare two nodes for equality."""
return (self.type, self.value) == (other.type, other.value)
"""Compare two nodes for equality."""
return (self.type, self.value) == (other.type, other.value)
+ def clone(self) -> "Leaf":
+ assert self.type is not None
"""Return a cloned (deep) copy of self."""
return Leaf(
self.type,
"""Return a cloned (deep) copy of self."""
return Leaf(
self.type,
fixers_applied=self.fixers_applied,
)
fixers_applied=self.fixers_applied,
)
+ def leaves(self) -> Iterator["Leaf"] :
+ def post_order(self) -> Iterator["Leaf"] :
"""Return a post-order iterator for the tree."""
yield self
"""Return a post-order iterator for the tree."""
yield self
+ def pre_order(self) -> Iterator["Leaf"] :
"""Return a pre-order iterator for the tree."""
yield self
@property
"""Return a pre-order iterator for the tree."""
yield self
@property
+ def prefix(self) -> Text :
"""
The whitespace and comments preceding this token in the input.
"""
return self._prefix
@prefix.setter
"""
The whitespace and comments preceding this token in the input.
"""
return self._prefix
@prefix.setter
- def prefix(self, prefix):
+ def prefix(self, prefix) -> None :
self.changed()
self._prefix = prefix
self.changed()
self._prefix = prefix
-def convert(gr, raw_node) :
+def convert(gr: Grammar, raw_node: RawNode) -> NL :
"""
Convert raw node information to a Node or Leaf instance.
"""
Convert raw node information to a Node or Leaf instance.
if children or type in gr.number2symbol:
# If there's exactly one child, return that child instead of
# creating a new node.
if children or type in gr.number2symbol:
# If there's exactly one child, return that child instead of
# creating a new node.
+ assert children is not None
if len(children) == 1:
return children[0]
return Node(type, children, context=context)
else:
if len(children) == 1:
return children[0]
return Node(type, children, context=context)
else:
- return Leaf(type, value, context=context)
+ return Leaf(type, value or "", context=context)
+
+
+_Results = Dict[Text, NL]
class BasePattern(object):
class BasePattern(object):
"""
# Defaults for instance variables
"""
# Defaults for instance variables
type = None # Node type (token if < 256, symbol if >= 256)
type = None # Node type (token if < 256, symbol if >= 256)
- content = None # Optional content matching pattern
- name = None # Optional name used to store match in results dict
+ content: Any = None # Optional content matching pattern
+ name: Optional[Text] = None # Optional name used to store match in results dict
def __new__(cls, *args, **kwds):
"""Constructor that prevents BasePattern from being instantiated."""
assert cls is not BasePattern, "Cannot instantiate BasePattern"
return object.__new__(cls)
def __new__(cls, *args, **kwds):
"""Constructor that prevents BasePattern from being instantiated."""
assert cls is not BasePattern, "Cannot instantiate BasePattern"
return object.__new__(cls)
+ def __repr__(self) -> Text:
+ assert self.type is not None
args = [type_repr(self.type), self.content, self.name]
while args and args[-1] is None:
del args[-1]
return "%s(%s)" % (self.__class__.__name__, ", ".join(map(repr, args)))
args = [type_repr(self.type), self.content, self.name]
while args and args[-1] is None:
del args[-1]
return "%s(%s)" % (self.__class__.__name__, ", ".join(map(repr, args)))
+ def _submatch(self, node, results=None) -> bool:
+ raise NotImplementedError
+
+ def optimize(self) -> "BasePattern":
"""
A subclass can define this as a hook for optimizations.
"""
A subclass can define this as a hook for optimizations.
- def match(self, node, results=None) :
+ def match(self, node: NL, results: Optional[_Results] = None) -> bool :
"""
Does this pattern exactly match a node?
"""
Does this pattern exactly match a node?
if self.type is not None and node.type != self.type:
return False
if self.content is not None:
if self.type is not None and node.type != self.type:
return False
if self.content is not None:
+ r: Optional[_Results] = None
if results is not None:
r = {}
if not self._submatch(node, r):
return False
if r:
if results is not None:
r = {}
if not self._submatch(node, r):
return False
if r:
+ assert results is not None
results.update(r)
if results is not None and self.name:
results[self.name] = node
return True
results.update(r)
if results is not None and self.name:
results[self.name] = node
return True
- def match_seq(self, nodes, results=None) :
+ def match_seq(self, nodes: List[NL], results: Optional[_Results] = None) -> bool :
"""
Does this pattern exactly match a sequence of nodes?
"""
Does this pattern exactly match a sequence of nodes?
return False
return self.match(nodes[0], results)
return False
return self.match(nodes[0], results)
- def generate_matches(self, nodes) :
+ def generate_matches(self, nodes: List[NL]) -> Iterator[Tuple[int, _Results]] :
"""
Generator yielding all matches for this pattern.
Default implementation for non-wildcard patterns.
"""
"""
Generator yielding all matches for this pattern.
Default implementation for non-wildcard patterns.
"""
if nodes and self.match(nodes[0], r):
yield 1, r
class LeafPattern(BasePattern):
if nodes and self.match(nodes[0], r):
yield 1, r
class LeafPattern(BasePattern):
- def __init__(self, type=None, content=None, name=None):
+ def __init__(
+ self,
+ type: Optional[int] = None,
+ content: Optional[Text] = None,
+ name: Optional[Text] = None,
+ ) -> None:
"""
Initializer. Takes optional type, content, and name.
"""
Initializer. Takes optional type, content, and name.
self.content = content
self.name = name
self.content = content
self.name = name
- def match(self, node, results=None):
+ def match(self, node: NL , results=None):
"""Override match() to insist on a leaf node."""
if not isinstance(node, Leaf):
return False
"""Override match() to insist on a leaf node."""
if not isinstance(node, Leaf):
return False
class NodePattern(BasePattern):
class NodePattern(BasePattern):
+ wildcards: bool = False
- def __init__(self, type=None, content=None, name=None):
+ def __init__(
+ self,
+ type: Optional[int] = None,
+ content: Optional[Iterable[Text]] = None,
+ name: Optional[Text] = None,
+ ) -> None:
"""
Initializer. Takes optional type, content, and name.
"""
Initializer. Takes optional type, content, and name.
assert type >= 256, type
if content is not None:
assert not isinstance(content, str), repr(content)
assert type >= 256, type
if content is not None:
assert not isinstance(content, str), repr(content)
- content = list(content)
- for i, item in enumerate(content):
+ new content = list(content)
+ for i, item in enumerate(new content):
assert isinstance(item, BasePattern), (i, item)
if isinstance(item, WildcardPattern):
self.wildcards = True
self.type = type
assert isinstance(item, BasePattern), (i, item)
if isinstance(item, WildcardPattern):
self.wildcards = True
self.type = type
+ self.content = new content
- def _submatch(self, node, results=None):
+ def _submatch(self, node, results=None) -> bool :
"""
Match the pattern's content to the node's children.
"""
Match the pattern's content to the node's children.
except it always uses non-greedy matching.
"""
except it always uses non-greedy matching.
"""
- def __init__(self, content=None, min=0, max=HUGE, name=None):
+ min: int
+ max: int
+
+ def __init__(
+ self,
+ content: Optional[Text] = None,
+ min: int = 0,
+ max: int = HUGE,
+ name: Optional[Text] = None,
+ ) -> None:
"""
assert 0 <= min <= max <= HUGE, (min, max)
if content is not None:
"""
assert 0 <= min <= max <= HUGE, (min, max)
if content is not None:
- content = tuple(map(tuple, content)) # Protect against alterations
+ f = lambda s: tuple(s)
+ wrapped_content = tuple(map(f, content)) # Protect against alterations
# Check sanity of alternatives
# Check sanity of alternatives
- assert len(content), repr(content) # Can't have zero alternatives
- for alt in content:
+ assert len(wrapped_content), repr(
+ wrapped_content
+ ) # Can't have zero alternatives
+ for alt in wrapped_content:
assert len(alt), repr(alt) # Can have empty alternatives
assert len(alt), repr(alt) # Can have empty alternatives
+ self.content = wrapped_ content
self.min = min
self.max = max
self.name = name
self.min = min
self.max = max
self.name = name
+ def optimize(self) -> Any :
"""Optimize certain stacked wildcard patterns."""
subpattern = None
if (
"""Optimize certain stacked wildcard patterns."""
subpattern = None
if (
- def match(self, node, results=None):
+ def match(self, node, results=None) -> bool :
"""Does this pattern exactly match a node?"""
return self.match_seq([node], results)
"""Does this pattern exactly match a node?"""
return self.match_seq([node], results)
- def match_seq(self, nodes, results=None):
+ def match_seq(self, nodes, results=None) -> bool :
"""Does this pattern exactly match a sequence of nodes?"""
for c, r in self.generate_matches(nodes):
if c == len(nodes):
"""Does this pattern exactly match a sequence of nodes?"""
for c, r in self.generate_matches(nodes):
if c == len(nodes):
- def generate_matches(self, nodes):
+ def generate_matches(self, nodes) -> Iterator[Tuple[int, _Results]] :
"""
Generator yielding matches for a sequence of nodes.
"""
Generator yielding matches for a sequence of nodes.
if hasattr(sys, "getrefcount"):
sys.stderr = save_stderr
if hasattr(sys, "getrefcount"):
sys.stderr = save_stderr
- def _iterative_matches(self, nodes):
+ def _iterative_matches(self, nodes) -> Iterator[Tuple[int, _Results]] :
"""Helper to iteratively yield the matches."""
nodelen = len(nodes)
if 0 >= self.min:
"""Helper to iteratively yield the matches."""
nodelen = len(nodes)
if 0 >= self.min:
new_results.append((c0 + c1, r))
results = new_results
new_results.append((c0 + c1, r))
results = new_results
- def _bare_name_matches(self, nodes):
+ def _bare_name_matches(self, nodes) -> Tuple[int, _Results] :
"""Special optimized matcher for bare_name."""
count = 0
"""Special optimized matcher for bare_name."""
count = 0
+ r = {} # type: _Results
done = False
max = len(nodes)
while not done and count < max:
done = False
max = len(nodes)
while not done and count < max:
count += 1
done = False
break
count += 1
done = False
break
+ assert self.name is not None
r[self.name] = nodes[:count]
return count, r
r[self.name] = nodes[:count]
return count, r
- def _recursive_matches(self, nodes, count):
+ def _recursive_matches(self, nodes, count) -> Iterator[Tuple[int, _Results]] :
"""Helper to recursively yield the matches."""
assert self.content is not None
if count >= self.min:
"""Helper to recursively yield the matches."""
assert self.content is not None
if count >= self.min:
class NegatedPattern(BasePattern):
class NegatedPattern(BasePattern):
- def __init__(self, content=None) :
+ def __init__(self, content: Optional[Any] = None) -> None :
assert isinstance(content, BasePattern), repr(content)
self.content = content
assert isinstance(content, BasePattern), repr(content)
self.content = content
+ def match(self, node, results=None) -> bool :
# We never match a node in its entirety
return False
# We never match a node in its entirety
return False
- def match_seq(self, nodes) :
+ def match_seq(self, nodes, results=None) -> bool :
# We only match an empty sequence of nodes in its entirety
return len(nodes) == 0
# We only match an empty sequence of nodes in its entirety
return len(nodes) == 0
- def generate_matches(self, nodes):
+ def generate_matches(self, nodes) -> Iterator[Tuple[int, _Results]] :
if self.content is None:
# Return a match if there is an empty sequence
if len(nodes) == 0:
if self.content is None:
# Return a match if there is an empty sequence
if len(nodes) == 0:
-def generate_matches(patterns, nodes):
+def generate_matches(
+ patterns: List[BasePattern], nodes: List[NL]
+) -> Iterator[Tuple[int, _Results]]:
"""
Generator yielding matches for a sequence of patterns and nodes.
"""
Generator yielding matches for a sequence of patterns and nodes.
r.update(r0)
r.update(r1)
yield c0 + c1, r
r.update(r0)
r.update(r1)
yield c0 + c1, r
+
+
+_Convert = Callable[[Grammar, RawNode], Any]
projects / etc / vim.git / blobdiff