2008-03-19 01:43:46 -03:00
|
|
|
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
|
|
|
|
"""Python parse tree definitions.
|
|
|
|
|
|
|
|
This is a very concrete parse tree; we need to keep every token and
|
|
|
|
even the comments and whitespace between tokens.
|
|
|
|
|
|
|
|
There's also a pattern matching implementation here.
|
|
|
|
"""
|
|
|
|
|
|
|
|
__author__ = "Guido van Rossum <guido@python.org>"
|
|
|
|
|
Merged revisions 67428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
2008-11-28 19:04:28 -04:00
|
|
|
import sys
|
|
|
|
from StringIO import StringIO
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
HUGE = 0x7FFFFFFF # maximum repeat count, default max
|
|
|
|
|
Merged revisions 61602-61723 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line
Added fixer for implicit local imports. See #2414.
........
r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line
Added a class for tests which should not run if a particular import is found.
........
r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line
Two more relative import fixes in pgen2.
........
r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line
Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out.
........
r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines
Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
........
r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line
SVN is happier when you add the files you create... -_-'
........
r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line
Added an explicit sort order to fixers -- fixes problems like #2427
........
r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines
Fixes #2428 -- comments are no longer eatten by __future__ fixer.
........
r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line
Added 2to3 node pretty-printer
........
r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line
Made node printing a little bit prettier
........
r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines
Fix whitespace.
........
2008-03-21 21:01:12 -03:00
|
|
|
_type_reprs = {}
|
|
|
|
def type_repr(type_num):
|
|
|
|
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():
|
|
|
|
if type(val) == int: _type_reprs[val] = name
|
|
|
|
return _type_reprs.setdefault(type_num, type_num)
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
class Base(object):
|
|
|
|
|
|
|
|
"""Abstract base class for Node and Leaf.
|
|
|
|
|
|
|
|
This provides some default functionality and boilerplate using the
|
|
|
|
template pattern.
|
|
|
|
|
|
|
|
A node may be a subnode of at most one parent.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
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):
|
|
|
|
"""Compares two nodes for equality.
|
|
|
|
|
|
|
|
This calls the method _eq().
|
|
|
|
"""
|
|
|
|
if self.__class__ is not other.__class__:
|
|
|
|
return NotImplemented
|
|
|
|
return self._eq(other)
|
|
|
|
|
|
|
|
def __ne__(self, other):
|
|
|
|
"""Compares two nodes for inequality.
|
|
|
|
|
|
|
|
This calls the method _eq().
|
|
|
|
"""
|
|
|
|
if self.__class__ is not other.__class__:
|
|
|
|
return NotImplemented
|
|
|
|
return not self._eq(other)
|
|
|
|
|
|
|
|
def _eq(self, other):
|
|
|
|
"""Compares two nodes for equality.
|
|
|
|
|
|
|
|
This is called by __eq__ and __ne__. It is only called if the
|
|
|
|
two nodes have the same type. This must be implemented by the
|
|
|
|
concrete subclass. Nodes should be considered equal if they
|
|
|
|
have the same structure, ignoring the prefix string and other
|
|
|
|
context information.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def clone(self):
|
|
|
|
"""Returns a cloned (deep) copy of self.
|
|
|
|
|
|
|
|
This must be implemented by the concrete subclass.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def post_order(self):
|
|
|
|
"""Returns a post-order iterator for the tree.
|
|
|
|
|
|
|
|
This must be implemented by the concrete subclass.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def pre_order(self):
|
|
|
|
"""Returns a pre-order iterator for the tree.
|
|
|
|
|
|
|
|
This must be implemented by the concrete subclass.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def set_prefix(self, prefix):
|
|
|
|
"""Sets the prefix for the node (see Leaf class).
|
|
|
|
|
|
|
|
This must be implemented by the concrete subclass.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def get_prefix(self):
|
|
|
|
"""Returns the prefix for the node (see Leaf class).
|
|
|
|
|
|
|
|
This must be implemented by the concrete subclass.
|
|
|
|
"""
|
|
|
|
raise NotImplementedError
|
|
|
|
|
|
|
|
def replace(self, new):
|
|
|
|
"""Replaces this node with a new one in the parent."""
|
|
|
|
assert self.parent is not None, str(self)
|
|
|
|
assert new is not None
|
|
|
|
if not isinstance(new, list):
|
|
|
|
new = [new]
|
|
|
|
l_children = []
|
|
|
|
found = False
|
|
|
|
for ch in self.parent.children:
|
|
|
|
if ch is self:
|
|
|
|
assert not found, (self.parent.children, self, new)
|
|
|
|
if new is not None:
|
|
|
|
l_children.extend(new)
|
|
|
|
found = True
|
|
|
|
else:
|
|
|
|
l_children.append(ch)
|
|
|
|
assert found, (self.children, self, new)
|
|
|
|
self.parent.changed()
|
|
|
|
self.parent.children = l_children
|
|
|
|
for x in new:
|
|
|
|
x.parent = self.parent
|
|
|
|
self.parent = None
|
|
|
|
|
|
|
|
def get_lineno(self):
|
|
|
|
"""Returns the line number which generated the invocant node."""
|
|
|
|
node = self
|
|
|
|
while not isinstance(node, Leaf):
|
|
|
|
if not node.children:
|
|
|
|
return
|
|
|
|
node = node.children[0]
|
|
|
|
return node.lineno
|
|
|
|
|
|
|
|
def changed(self):
|
|
|
|
if self.parent:
|
|
|
|
self.parent.changed()
|
|
|
|
self.was_changed = True
|
|
|
|
|
|
|
|
def remove(self):
|
|
|
|
"""Remove the node from the tree. Returns the position of the node
|
|
|
|
in its parent's children before it was removed."""
|
|
|
|
if self.parent:
|
|
|
|
for i, node in enumerate(self.parent.children):
|
|
|
|
if node is self:
|
|
|
|
self.parent.changed()
|
|
|
|
del self.parent.children[i]
|
|
|
|
self.parent = None
|
|
|
|
return i
|
|
|
|
|
|
|
|
def get_next_sibling(self):
|
|
|
|
"""Return the node immediately following the invocant in their
|
|
|
|
parent's children list. If the invocant does not have a next
|
|
|
|
sibling, return None."""
|
|
|
|
if self.parent is None:
|
|
|
|
return None
|
|
|
|
|
|
|
|
# Can't use index(); we need to test by identity
|
2008-04-09 23:48:01 -03:00
|
|
|
for i, child in enumerate(self.parent.children):
|
|
|
|
if child is self:
|
2008-03-19 01:43:46 -03:00
|
|
|
try:
|
|
|
|
return self.parent.children[i+1]
|
|
|
|
except IndexError:
|
|
|
|
return None
|
|
|
|
|
2008-04-09 23:48:01 -03:00
|
|
|
def get_prev_sibling(self):
|
|
|
|
"""Return the node immediately preceding the invocant in their
|
|
|
|
parent's children list. If the invocant does not have a previous
|
|
|
|
sibling, return None."""
|
|
|
|
if self.parent is None:
|
|
|
|
return None
|
|
|
|
|
|
|
|
# Can't use index(); we need to test by identity
|
|
|
|
for i, child in enumerate(self.parent.children):
|
|
|
|
if child is self:
|
|
|
|
if i == 0:
|
|
|
|
return None
|
|
|
|
return self.parent.children[i-1]
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
def get_suffix(self):
|
|
|
|
"""Return the string immediately following the invocant node. This
|
|
|
|
is effectively equivalent to node.get_next_sibling().get_prefix()"""
|
|
|
|
next_sib = self.get_next_sibling()
|
|
|
|
if next_sib is None:
|
|
|
|
return ""
|
|
|
|
return next_sib.get_prefix()
|
|
|
|
|
|
|
|
|
|
|
|
class Node(Base):
|
|
|
|
|
|
|
|
"""Concrete implementation for interior nodes."""
|
|
|
|
|
|
|
|
def __init__(self, type, children, context=None, prefix=None):
|
|
|
|
"""Initializer.
|
|
|
|
|
|
|
|
Takes a type constant (a symbol number >= 256), a sequence of
|
|
|
|
child nodes, and an optional context keyword argument.
|
|
|
|
|
|
|
|
As a side effect, the parent pointers of the children are updated.
|
|
|
|
"""
|
|
|
|
assert type >= 256, type
|
|
|
|
self.type = type
|
|
|
|
self.children = list(children)
|
|
|
|
for ch in self.children:
|
|
|
|
assert ch.parent is None, repr(ch)
|
|
|
|
ch.parent = self
|
|
|
|
if prefix is not None:
|
|
|
|
self.set_prefix(prefix)
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
"""Returns a canonical string representation."""
|
Merged revisions 61602-61723 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line
Added fixer for implicit local imports. See #2414.
........
r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line
Added a class for tests which should not run if a particular import is found.
........
r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line
Two more relative import fixes in pgen2.
........
r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line
Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out.
........
r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines
Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
........
r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line
SVN is happier when you add the files you create... -_-'
........
r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line
Added an explicit sort order to fixers -- fixes problems like #2427
........
r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines
Fixes #2428 -- comments are no longer eatten by __future__ fixer.
........
r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line
Added 2to3 node pretty-printer
........
r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line
Made node printing a little bit prettier
........
r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines
Fix whitespace.
........
2008-03-21 21:01:12 -03:00
|
|
|
return "%s(%s, %r)" % (self.__class__.__name__,
|
|
|
|
type_repr(self.type),
|
2008-03-19 01:43:46 -03:00
|
|
|
self.children)
|
|
|
|
|
|
|
|
def __str__(self):
|
|
|
|
"""Returns a pretty string representation.
|
|
|
|
|
|
|
|
This reproduces the input source exactly.
|
|
|
|
"""
|
|
|
|
return "".join(map(str, self.children))
|
|
|
|
|
|
|
|
def _eq(self, other):
|
|
|
|
"""Compares two nodes for equality."""
|
|
|
|
return (self.type, self.children) == (other.type, other.children)
|
|
|
|
|
|
|
|
def clone(self):
|
|
|
|
"""Returns a cloned (deep) copy of self."""
|
|
|
|
return Node(self.type, [ch.clone() for ch in self.children])
|
|
|
|
|
|
|
|
def post_order(self):
|
|
|
|
"""Returns a post-order iterator for the tree."""
|
|
|
|
for child in self.children:
|
|
|
|
for node in child.post_order():
|
|
|
|
yield node
|
|
|
|
yield self
|
|
|
|
|
|
|
|
def pre_order(self):
|
|
|
|
"""Returns a pre-order iterator for the tree."""
|
|
|
|
yield self
|
|
|
|
for child in self.children:
|
|
|
|
for node in child.post_order():
|
|
|
|
yield node
|
|
|
|
|
|
|
|
def set_prefix(self, prefix):
|
|
|
|
"""Sets the prefix for the node.
|
|
|
|
|
|
|
|
This passes the responsibility on to the first child.
|
|
|
|
"""
|
|
|
|
if self.children:
|
|
|
|
self.children[0].set_prefix(prefix)
|
|
|
|
|
|
|
|
def get_prefix(self):
|
|
|
|
"""Returns the prefix for the node.
|
|
|
|
|
|
|
|
This passes the call on to the first child.
|
|
|
|
"""
|
|
|
|
if not self.children:
|
|
|
|
return ""
|
|
|
|
return self.children[0].get_prefix()
|
|
|
|
|
|
|
|
def set_child(self, i, child):
|
|
|
|
"""Equivalent to 'node.children[i] = child'. This method also sets the
|
|
|
|
child's parent attribute appropriately."""
|
|
|
|
child.parent = self
|
|
|
|
self.children[i].parent = None
|
|
|
|
self.children[i] = child
|
|
|
|
|
|
|
|
def insert_child(self, i, child):
|
|
|
|
"""Equivalent to 'node.children.insert(i, child)'. This method also
|
|
|
|
sets the child's parent attribute appropriately."""
|
|
|
|
child.parent = self
|
|
|
|
self.children.insert(i, child)
|
|
|
|
|
|
|
|
def append_child(self, child):
|
|
|
|
"""Equivalent to 'node.children.append(child)'. This method also
|
|
|
|
sets the child's parent attribute appropriately."""
|
|
|
|
child.parent = self
|
|
|
|
self.children.append(child)
|
|
|
|
|
|
|
|
|
|
|
|
class Leaf(Base):
|
|
|
|
|
|
|
|
"""Concrete implementation for leaf nodes."""
|
|
|
|
|
|
|
|
# Default values for instance variables
|
|
|
|
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 tarts in the input
|
|
|
|
|
|
|
|
def __init__(self, type, value, context=None, prefix=None):
|
|
|
|
"""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
|
|
|
|
self.type = type
|
|
|
|
self.value = value
|
|
|
|
if prefix is not None:
|
|
|
|
self.prefix = prefix
|
|
|
|
|
|
|
|
def __repr__(self):
|
|
|
|
"""Returns a canonical string representation."""
|
|
|
|
return "%s(%r, %r)" % (self.__class__.__name__,
|
|
|
|
self.type,
|
|
|
|
self.value)
|
|
|
|
|
|
|
|
def __str__(self):
|
|
|
|
"""Returns a pretty string representation.
|
|
|
|
|
|
|
|
This reproduces the input source exactly.
|
|
|
|
"""
|
|
|
|
return self.prefix + str(self.value)
|
|
|
|
|
|
|
|
def _eq(self, other):
|
|
|
|
"""Compares two nodes for equality."""
|
|
|
|
return (self.type, self.value) == (other.type, other.value)
|
|
|
|
|
|
|
|
def clone(self):
|
|
|
|
"""Returns a cloned (deep) copy of self."""
|
|
|
|
return Leaf(self.type, self.value,
|
|
|
|
(self.prefix, (self.lineno, self.column)))
|
|
|
|
|
|
|
|
def post_order(self):
|
|
|
|
"""Returns a post-order iterator for the tree."""
|
|
|
|
yield self
|
|
|
|
|
|
|
|
def pre_order(self):
|
|
|
|
"""Returns a pre-order iterator for the tree."""
|
|
|
|
yield self
|
|
|
|
|
|
|
|
def set_prefix(self, prefix):
|
|
|
|
"""Sets the prefix for the node."""
|
|
|
|
self.changed()
|
|
|
|
self.prefix = prefix
|
|
|
|
|
|
|
|
def get_prefix(self):
|
|
|
|
"""Returns the prefix for the node."""
|
|
|
|
return self.prefix
|
|
|
|
|
|
|
|
|
|
|
|
def convert(gr, raw_node):
|
|
|
|
"""Converts raw node information to a Node or Leaf instance.
|
|
|
|
|
|
|
|
This is passed to the parser driver which calls it whenever a
|
|
|
|
reduction of a grammar rule produces a new complete node, so that
|
|
|
|
the tree is build strictly bottom-up.
|
|
|
|
"""
|
|
|
|
type, value, context, children = raw_node
|
|
|
|
if children or type in gr.number2symbol:
|
|
|
|
# If there's exactly one child, return that child instead of
|
|
|
|
# creating a new node.
|
|
|
|
if len(children) == 1:
|
|
|
|
return children[0]
|
|
|
|
return Node(type, children, context=context)
|
|
|
|
else:
|
|
|
|
return Leaf(type, value, context=context)
|
|
|
|
|
|
|
|
|
|
|
|
class BasePattern(object):
|
|
|
|
|
|
|
|
"""A pattern is a tree matching pattern.
|
|
|
|
|
|
|
|
It looks for a specific node type (token or symbol), and
|
|
|
|
optionally for a specific content.
|
|
|
|
|
|
|
|
This is an abstract base class. There are three concrete
|
|
|
|
subclasses:
|
|
|
|
|
|
|
|
- LeafPattern matches a single leaf node;
|
|
|
|
- NodePattern matches a single node (usually non-leaf);
|
|
|
|
- WildcardPattern matches a sequence of nodes of variable length.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# Defaults for instance variables
|
|
|
|
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
|
|
|
|
|
|
|
|
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):
|
Merged revisions 61602-61723 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line
Added fixer for implicit local imports. See #2414.
........
r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line
Added a class for tests which should not run if a particular import is found.
........
r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line
Two more relative import fixes in pgen2.
........
r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line
Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function. 2to3 gets upset, though, so the tests have been commented out.
........
r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines
Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
........
r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line
SVN is happier when you add the files you create... -_-'
........
r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line
Added an explicit sort order to fixers -- fixes problems like #2427
........
r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines
Fixes #2428 -- comments are no longer eatten by __future__ fixer.
........
r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line
Added 2to3 node pretty-printer
........
r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line
Made node printing a little bit prettier
........
r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines
Fix whitespace.
........
2008-03-21 21:01:12 -03:00
|
|
|
args = [type_repr(self.type), self.content, self.name]
|
2008-03-19 01:43:46 -03:00
|
|
|
while args and args[-1] is None:
|
|
|
|
del args[-1]
|
|
|
|
return "%s(%s)" % (self.__class__.__name__, ", ".join(map(repr, args)))
|
|
|
|
|
|
|
|
def optimize(self):
|
|
|
|
"""A subclass can define this as a hook for optimizations.
|
|
|
|
|
|
|
|
Returns either self or another node with the same effect.
|
|
|
|
"""
|
|
|
|
return self
|
|
|
|
|
|
|
|
def match(self, node, results=None):
|
|
|
|
"""Does this pattern exactly match a node?
|
|
|
|
|
|
|
|
Returns True if it matches, False if not.
|
|
|
|
|
|
|
|
If results is not None, it must be a dict which will be
|
|
|
|
updated with the nodes matching named subpatterns.
|
|
|
|
|
|
|
|
Default implementation for non-wildcard patterns.
|
|
|
|
"""
|
|
|
|
if self.type is not None and node.type != self.type:
|
|
|
|
return False
|
|
|
|
if self.content is not None:
|
|
|
|
r = None
|
|
|
|
if results is not None:
|
|
|
|
r = {}
|
|
|
|
if not self._submatch(node, r):
|
|
|
|
return False
|
|
|
|
if r:
|
|
|
|
results.update(r)
|
|
|
|
if results is not None and self.name:
|
|
|
|
results[self.name] = node
|
|
|
|
return True
|
|
|
|
|
|
|
|
def match_seq(self, nodes, results=None):
|
|
|
|
"""Does this pattern exactly match a sequence of nodes?
|
|
|
|
|
|
|
|
Default implementation for non-wildcard patterns.
|
|
|
|
"""
|
|
|
|
if len(nodes) != 1:
|
|
|
|
return False
|
|
|
|
return self.match(nodes[0], results)
|
|
|
|
|
|
|
|
def generate_matches(self, nodes):
|
|
|
|
"""Generator yielding all matches for this pattern.
|
|
|
|
|
|
|
|
Default implementation for non-wildcard patterns.
|
|
|
|
"""
|
|
|
|
r = {}
|
|
|
|
if nodes and self.match(nodes[0], r):
|
|
|
|
yield 1, r
|
|
|
|
|
|
|
|
|
|
|
|
class LeafPattern(BasePattern):
|
|
|
|
|
|
|
|
def __init__(self, type=None, content=None, name=None):
|
|
|
|
"""Initializer. Takes optional type, content, and name.
|
|
|
|
|
|
|
|
The type, if given must be a token type (< 256). If not given,
|
|
|
|
this matches any *leaf* node; the content may still be required.
|
|
|
|
|
|
|
|
The content, if given, must be a string.
|
|
|
|
|
|
|
|
If a name is given, the matching node is stored in the results
|
|
|
|
dict under that key.
|
|
|
|
"""
|
|
|
|
if type is not None:
|
|
|
|
assert 0 <= type < 256, type
|
|
|
|
if content is not None:
|
|
|
|
assert isinstance(content, basestring), repr(content)
|
|
|
|
self.type = type
|
|
|
|
self.content = content
|
|
|
|
self.name = name
|
|
|
|
|
|
|
|
def match(self, node, results=None):
|
|
|
|
"""Override match() to insist on a leaf node."""
|
|
|
|
if not isinstance(node, Leaf):
|
|
|
|
return False
|
|
|
|
return BasePattern.match(self, node, results)
|
|
|
|
|
|
|
|
def _submatch(self, node, results=None):
|
|
|
|
"""Match the pattern's content to the node's children.
|
|
|
|
|
|
|
|
This assumes the node type matches and self.content is not None.
|
|
|
|
|
|
|
|
Returns True if it matches, False if not.
|
|
|
|
|
|
|
|
If results is not None, it must be a dict which will be
|
|
|
|
updated with the nodes matching named subpatterns.
|
|
|
|
|
|
|
|
When returning False, the results dict may still be updated.
|
|
|
|
"""
|
|
|
|
return self.content == node.value
|
|
|
|
|
|
|
|
|
|
|
|
class NodePattern(BasePattern):
|
|
|
|
|
|
|
|
wildcards = False
|
|
|
|
|
|
|
|
def __init__(self, type=None, content=None, name=None):
|
|
|
|
"""Initializer. Takes optional type, content, and name.
|
|
|
|
|
|
|
|
The type, if given, must be a symbol type (>= 256). If the
|
|
|
|
type is None this matches *any* single node (leaf or not),
|
|
|
|
except if content is not None, in which it only matches
|
|
|
|
non-leaf nodes that also match the content pattern.
|
|
|
|
|
|
|
|
The content, if not None, must be a sequence of Patterns that
|
|
|
|
must match the node's children exactly. If the content is
|
|
|
|
given, the type must not be None.
|
|
|
|
|
|
|
|
If a name is given, the matching node is stored in the results
|
|
|
|
dict under that key.
|
|
|
|
"""
|
|
|
|
if type is not None:
|
|
|
|
assert type >= 256, type
|
|
|
|
if content is not None:
|
|
|
|
assert not isinstance(content, basestring), repr(content)
|
|
|
|
content = list(content)
|
|
|
|
for i, item in enumerate(content):
|
|
|
|
assert isinstance(item, BasePattern), (i, item)
|
|
|
|
if isinstance(item, WildcardPattern):
|
|
|
|
self.wildcards = True
|
|
|
|
self.type = type
|
|
|
|
self.content = content
|
|
|
|
self.name = name
|
|
|
|
|
|
|
|
def _submatch(self, node, results=None):
|
|
|
|
"""Match the pattern's content to the node's children.
|
|
|
|
|
|
|
|
This assumes the node type matches and self.content is not None.
|
|
|
|
|
|
|
|
Returns True if it matches, False if not.
|
|
|
|
|
|
|
|
If results is not None, it must be a dict which will be
|
|
|
|
updated with the nodes matching named subpatterns.
|
|
|
|
|
|
|
|
When returning False, the results dict may still be updated.
|
|
|
|
"""
|
|
|
|
if self.wildcards:
|
|
|
|
for c, r in generate_matches(self.content, node.children):
|
|
|
|
if c == len(node.children):
|
|
|
|
if results is not None:
|
|
|
|
results.update(r)
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
if len(self.content) != len(node.children):
|
|
|
|
return False
|
|
|
|
for subpattern, child in zip(self.content, node.children):
|
|
|
|
if not subpattern.match(child, results):
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
class WildcardPattern(BasePattern):
|
|
|
|
|
|
|
|
"""A wildcard pattern can match zero or more nodes.
|
|
|
|
|
|
|
|
This has all the flexibility needed to implement patterns like:
|
|
|
|
|
|
|
|
.* .+ .? .{m,n}
|
|
|
|
(a b c | d e | f)
|
|
|
|
(...)* (...)+ (...)? (...){m,n}
|
|
|
|
|
|
|
|
except it always uses non-greedy matching.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, content=None, min=0, max=HUGE, name=None):
|
|
|
|
"""Initializer.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
content: optional sequence of subsequences of patterns;
|
|
|
|
if absent, matches one node;
|
|
|
|
if present, each subsequence is an alternative [*]
|
|
|
|
min: optinal minumum number of times to match, default 0
|
|
|
|
max: optional maximum number of times tro match, default HUGE
|
|
|
|
name: optional name assigned to this match
|
|
|
|
|
|
|
|
[*] Thus, if content is [[a, b, c], [d, e], [f, g, h]] this is
|
|
|
|
equivalent to (a b c | d e | f g h); if content is None,
|
|
|
|
this is equivalent to '.' in regular expression terms.
|
|
|
|
The min and max parameters work as follows:
|
|
|
|
min=0, max=maxint: .*
|
|
|
|
min=1, max=maxint: .+
|
|
|
|
min=0, max=1: .?
|
|
|
|
min=1, max=1: .
|
|
|
|
If content is not None, replace the dot with the parenthesized
|
|
|
|
list of alternatives, e.g. (a b c | d e | f g h)*
|
|
|
|
"""
|
|
|
|
assert 0 <= min <= max <= HUGE, (min, max)
|
|
|
|
if content is not None:
|
|
|
|
content = tuple(map(tuple, content)) # Protect against alterations
|
|
|
|
# Check sanity of alternatives
|
|
|
|
assert len(content), repr(content) # Can't have zero alternatives
|
|
|
|
for alt in content:
|
|
|
|
assert len(alt), repr(alt) # Can have empty alternatives
|
|
|
|
self.content = content
|
|
|
|
self.min = min
|
|
|
|
self.max = max
|
|
|
|
self.name = name
|
|
|
|
|
|
|
|
def optimize(self):
|
|
|
|
"""Optimize certain stacked wildcard patterns."""
|
|
|
|
subpattern = None
|
|
|
|
if (self.content is not None and
|
|
|
|
len(self.content) == 1 and len(self.content[0]) == 1):
|
|
|
|
subpattern = self.content[0][0]
|
|
|
|
if self.min == 1 and self.max == 1:
|
|
|
|
if self.content is None:
|
|
|
|
return NodePattern(name=self.name)
|
|
|
|
if subpattern is not None and self.name == subpattern.name:
|
|
|
|
return subpattern.optimize()
|
|
|
|
if (self.min <= 1 and isinstance(subpattern, WildcardPattern) and
|
|
|
|
subpattern.min <= 1 and self.name == subpattern.name):
|
|
|
|
return WildcardPattern(subpattern.content,
|
|
|
|
self.min*subpattern.min,
|
|
|
|
self.max*subpattern.max,
|
|
|
|
subpattern.name)
|
|
|
|
return self
|
|
|
|
|
|
|
|
def match(self, node, results=None):
|
|
|
|
"""Does this pattern exactly match a node?"""
|
|
|
|
return self.match_seq([node], results)
|
|
|
|
|
|
|
|
def match_seq(self, nodes, results=None):
|
|
|
|
"""Does this pattern exactly match a sequence of nodes?"""
|
|
|
|
for c, r in self.generate_matches(nodes):
|
|
|
|
if c == len(nodes):
|
|
|
|
if results is not None:
|
|
|
|
results.update(r)
|
|
|
|
if self.name:
|
|
|
|
results[self.name] = list(nodes)
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def generate_matches(self, nodes):
|
|
|
|
"""Generator yielding matches for a sequence of nodes.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
nodes: sequence of nodes
|
|
|
|
|
|
|
|
Yields:
|
|
|
|
(count, results) tuples where:
|
|
|
|
count: the match comprises nodes[:count];
|
|
|
|
results: dict containing named submatches.
|
|
|
|
"""
|
|
|
|
if self.content is None:
|
|
|
|
# Shortcut for special case (see __init__.__doc__)
|
|
|
|
for count in xrange(self.min, 1 + min(len(nodes), self.max)):
|
|
|
|
r = {}
|
|
|
|
if self.name:
|
|
|
|
r[self.name] = nodes[:count]
|
|
|
|
yield count, r
|
2008-07-16 23:07:46 -03:00
|
|
|
elif self.name == "bare_name":
|
|
|
|
yield self._bare_name_matches(nodes)
|
2008-03-19 01:43:46 -03:00
|
|
|
else:
|
Merged revisions 67428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
2008-11-28 19:04:28 -04:00
|
|
|
# The reason for this is that hitting the recursion limit usually
|
|
|
|
# results in some ugly messages about how RuntimeErrors are being
|
|
|
|
# ignored.
|
|
|
|
save_stderr = sys.stderr
|
|
|
|
sys.stderr = StringIO()
|
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66766 | benjamin.peterson | 2008-10-03 06:52:06 -0500 (Fri, 03 Oct 2008) | 1 line
update the mac installer script
................
r66767 | andrew.kuchling | 2008-10-03 07:26:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring typo.
................
r66771 | hirokazu.yamamoto | 2008-10-03 11:18:42 -0500 (Fri, 03 Oct 2008) | 2 lines
Fixed following error when DocXMLRPCServer failed.
UnboundLocalError: local variable 'serv' referenced before assignment
................
r66772 | andrew.kuchling | 2008-10-03 11:29:19 -0500 (Fri, 03 Oct 2008) | 1 line
Mention exception in docstring
................
r66774 | andrew.kuchling | 2008-10-03 11:42:52 -0500 (Fri, 03 Oct 2008) | 1 line
Typo fix
................
r66776 | hirokazu.yamamoto | 2008-10-03 12:34:49 -0500 (Fri, 03 Oct 2008) | 2 lines
Issue #1706863: Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.
................
r66783 | andrew.kuchling | 2008-10-03 20:02:29 -0500 (Fri, 03 Oct 2008) | 1 line
Use correct capitalization of NaN
................
r66784 | andrew.kuchling | 2008-10-03 20:03:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring change: Specify exception raised
................
r66785 | andrew.kuchling | 2008-10-03 20:04:24 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring changes: Specify exceptions raised
................
r66786 | andrew.kuchling | 2008-10-03 20:05:56 -0500 (Fri, 03 Oct 2008) | 3 lines
Docstring change for *partition: use same tense as other docstrings.
Hyphenate left- and right-justified.
Fix 'registerd' typo
................
r66787 | andrew.kuchling | 2008-10-03 22:08:56 -0500 (Fri, 03 Oct 2008) | 1 line
two corrections
................
r66790 | andrew.kuchling | 2008-10-04 11:52:01 -0500 (Sat, 04 Oct 2008) | 1 line
Set svn:keywords
................
r66793 | georg.brandl | 2008-10-04 13:26:01 -0500 (Sat, 04 Oct 2008) | 2 lines
#4041: don't refer to removed and outdated modules.
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 18:33:08 -03:00
|
|
|
try:
|
|
|
|
for count, r in self._recursive_matches(nodes, 0):
|
|
|
|
if self.name:
|
|
|
|
r[self.name] = nodes[:count]
|
|
|
|
yield count, r
|
|
|
|
except RuntimeError:
|
|
|
|
# We fall back to the iterative pattern matching scheme if the recursive
|
|
|
|
# scheme hits the recursion limit.
|
|
|
|
for count, r in self._iterative_matches(nodes):
|
|
|
|
if self.name:
|
|
|
|
r[self.name] = nodes[:count]
|
|
|
|
yield count, r
|
Merged revisions 67428 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67428 | benjamin.peterson | 2008-11-28 16:12:14 -0600 (Fri, 28 Nov 2008) | 57 lines
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
................
2008-11-28 19:04:28 -04:00
|
|
|
finally:
|
|
|
|
sys.stderr = save_stderr
|
Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66766 | benjamin.peterson | 2008-10-03 06:52:06 -0500 (Fri, 03 Oct 2008) | 1 line
update the mac installer script
................
r66767 | andrew.kuchling | 2008-10-03 07:26:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring typo.
................
r66771 | hirokazu.yamamoto | 2008-10-03 11:18:42 -0500 (Fri, 03 Oct 2008) | 2 lines
Fixed following error when DocXMLRPCServer failed.
UnboundLocalError: local variable 'serv' referenced before assignment
................
r66772 | andrew.kuchling | 2008-10-03 11:29:19 -0500 (Fri, 03 Oct 2008) | 1 line
Mention exception in docstring
................
r66774 | andrew.kuchling | 2008-10-03 11:42:52 -0500 (Fri, 03 Oct 2008) | 1 line
Typo fix
................
r66776 | hirokazu.yamamoto | 2008-10-03 12:34:49 -0500 (Fri, 03 Oct 2008) | 2 lines
Issue #1706863: Fixed "'NoneType' object has no attribute 'rfind'" error when sqlite libfile not found.
................
r66783 | andrew.kuchling | 2008-10-03 20:02:29 -0500 (Fri, 03 Oct 2008) | 1 line
Use correct capitalization of NaN
................
r66784 | andrew.kuchling | 2008-10-03 20:03:42 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring change: Specify exception raised
................
r66785 | andrew.kuchling | 2008-10-03 20:04:24 -0500 (Fri, 03 Oct 2008) | 1 line
Docstring changes: Specify exceptions raised
................
r66786 | andrew.kuchling | 2008-10-03 20:05:56 -0500 (Fri, 03 Oct 2008) | 3 lines
Docstring change for *partition: use same tense as other docstrings.
Hyphenate left- and right-justified.
Fix 'registerd' typo
................
r66787 | andrew.kuchling | 2008-10-03 22:08:56 -0500 (Fri, 03 Oct 2008) | 1 line
two corrections
................
r66790 | andrew.kuchling | 2008-10-04 11:52:01 -0500 (Sat, 04 Oct 2008) | 1 line
Set svn:keywords
................
r66793 | georg.brandl | 2008-10-04 13:26:01 -0500 (Sat, 04 Oct 2008) | 2 lines
#4041: don't refer to removed and outdated modules.
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
Merged revisions 66707,66775,66782 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line
fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines
Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.
Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line
add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
................
2008-10-04 18:33:08 -03:00
|
|
|
|
|
|
|
def _iterative_matches(self, nodes):
|
|
|
|
"""Helper to iteratively yield the matches."""
|
|
|
|
nodelen = len(nodes)
|
|
|
|
if 0 >= self.min:
|
|
|
|
yield 0, {}
|
|
|
|
|
|
|
|
results = []
|
|
|
|
# generate matches that use just one alt from self.content
|
|
|
|
for alt in self.content:
|
|
|
|
for c, r in generate_matches(alt, nodes):
|
|
|
|
yield c, r
|
|
|
|
results.append((c, r))
|
|
|
|
|
|
|
|
# for each match, iterate down the nodes
|
|
|
|
while results:
|
|
|
|
new_results = []
|
|
|
|
for c0, r0 in results:
|
|
|
|
# stop if the entire set of nodes has been matched
|
|
|
|
if c0 < nodelen and c0 <= self.max:
|
|
|
|
for alt in self.content:
|
|
|
|
for c1, r1 in generate_matches(alt, nodes[c0:]):
|
|
|
|
if c1 > 0:
|
|
|
|
r = {}
|
|
|
|
r.update(r0)
|
|
|
|
r.update(r1)
|
|
|
|
yield c0 + c1, r
|
|
|
|
new_results.append((c0 + c1, r))
|
|
|
|
results = new_results
|
2008-03-19 01:43:46 -03:00
|
|
|
|
2008-07-16 23:07:46 -03:00
|
|
|
def _bare_name_matches(self, nodes):
|
|
|
|
"""Special optimized matcher for bare_name."""
|
|
|
|
count = 0
|
|
|
|
r = {}
|
|
|
|
done = False
|
|
|
|
max = len(nodes)
|
|
|
|
while not done and count < max:
|
|
|
|
done = True
|
|
|
|
for leaf in self.content:
|
|
|
|
if leaf[0].match(nodes[count], r):
|
|
|
|
count += 1
|
|
|
|
done = False
|
|
|
|
break
|
|
|
|
r[self.name] = nodes[:count]
|
|
|
|
return count, r
|
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
def _recursive_matches(self, nodes, count):
|
|
|
|
"""Helper to recursively yield the matches."""
|
|
|
|
assert self.content is not None
|
|
|
|
if count >= self.min:
|
2008-07-16 23:07:46 -03:00
|
|
|
yield 0, {}
|
2008-03-19 01:43:46 -03:00
|
|
|
if count < self.max:
|
|
|
|
for alt in self.content:
|
|
|
|
for c0, r0 in generate_matches(alt, nodes):
|
|
|
|
for c1, r1 in self._recursive_matches(nodes[c0:], count+1):
|
|
|
|
r = {}
|
|
|
|
r.update(r0)
|
|
|
|
r.update(r1)
|
|
|
|
yield c0 + c1, r
|
|
|
|
|
|
|
|
|
|
|
|
class NegatedPattern(BasePattern):
|
|
|
|
|
|
|
|
def __init__(self, content=None):
|
|
|
|
"""Initializer.
|
|
|
|
|
|
|
|
The argument is either a pattern or None. If it is None, this
|
|
|
|
only matches an empty sequence (effectively '$' in regex
|
|
|
|
lingo). If it is not None, this matches whenever the argument
|
|
|
|
pattern doesn't have any matches.
|
|
|
|
"""
|
|
|
|
if content is not None:
|
|
|
|
assert isinstance(content, BasePattern), repr(content)
|
|
|
|
self.content = content
|
|
|
|
|
|
|
|
def match(self, node):
|
|
|
|
# We never match a node in its entirety
|
|
|
|
return False
|
|
|
|
|
|
|
|
def match_seq(self, nodes):
|
|
|
|
# We only match an empty sequence of nodes in its entirety
|
|
|
|
return len(nodes) == 0
|
|
|
|
|
|
|
|
def generate_matches(self, nodes):
|
|
|
|
if self.content is None:
|
|
|
|
# Return a match if there is an empty sequence
|
|
|
|
if len(nodes) == 0:
|
|
|
|
yield 0, {}
|
|
|
|
else:
|
|
|
|
# Return a match if the argument pattern has no matches
|
|
|
|
for c, r in self.content.generate_matches(nodes):
|
|
|
|
return
|
|
|
|
yield 0, {}
|
|
|
|
|
|
|
|
|
|
|
|
def generate_matches(patterns, nodes):
|
|
|
|
"""Generator yielding matches for a sequence of patterns and nodes.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
patterns: a sequence of patterns
|
|
|
|
nodes: a sequence of nodes
|
|
|
|
|
|
|
|
Yields:
|
|
|
|
(count, results) tuples where:
|
|
|
|
count: the entire sequence of patterns matches nodes[:count];
|
|
|
|
results: dict containing named submatches.
|
|
|
|
"""
|
|
|
|
if not patterns:
|
|
|
|
yield 0, {}
|
|
|
|
else:
|
|
|
|
p, rest = patterns[0], patterns[1:]
|
|
|
|
for c0, r0 in p.generate_matches(nodes):
|
|
|
|
if not rest:
|
|
|
|
yield c0, r0
|
|
|
|
else:
|
|
|
|
for c1, r1 in generate_matches(rest, nodes[c0:]):
|
|
|
|
r = {}
|
|
|
|
r.update(r0)
|
|
|
|
r.update(r1)
|
|
|
|
yield c0 + c1, r
|