jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 09:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wierd comprehension bug seen via new loctraceback

Browse Source
This commit is contained in:
rocky
2018-02-15 12:15:49 -05:00
parent f7f0aa5ea9
commit fa4f614295
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
uncompyle6/semantics/fragments.py
View File

@@ -766,7 +766,8 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.set_pos_info(node[-1], gen_start, len(self.f.getvalue())) self.set_pos_info(node[-1], gen_start, len(self.f.getvalue()))
def listcomprehension_walk2(self, node): def listcomprehension_walk2(self, node):
"""List comprehensions the way they are done in Python3. """List comprehensions the way they are done in Python 2 (and
some Python 3?).
They're more other comprehensions, e.g. set comprehensions They're more other comprehensions, e.g. set comprehensions
See if we can combine code. See if we can combine code.
""" """
@@ -776,17 +777,24 @@ class FragmentsWalker(pysource.SourceWalker, object):
code = Code(node[1].attr, self.scanner, self.currentclass) code = Code(node[1].attr, self.scanner, self.currentclass)
ast = self.build_ast(code._tokens, code._customize) ast = self.build_ast(code._tokens, code._customize)
self.customize(code._customize) self.customize(code._customize)
ast = ast[0][0][0][0][0] if node == 'set_comp':
ast = ast[0][0][0]
else:
ast = ast[0][0][0][0][0]
if ast == 'expr':
ast = ast[0]
n = ast[1] n = ast[1]
collection = node[-3] collection = node[-3]
list_if = None list_if = None
assert n == 'list_iter' assert n == 'list_iter'
# find innermost node # Find the list comprehension body. It is the inner-most
# node that is not list_.. .
while n == 'list_iter': while n == 'list_iter':
n = n[0] # recurse one step n = n[0] # recurse one step
if n == 'list_for': if n == 'list_for':
store = n[2] store = n[2]
n = n[3] n = n[3]
elif n in ('list_if', 'list_if_not'): elif n in ('list_if', 'list_if_not'):

6
uncompyle6/semantics/pysource.py
View File

@@ -1620,7 +1620,8 @@ class SourceWalker(GenericASTTraversal, object):
self.prec = p self.prec = p
def listcomprehension_walk2(self, node): def listcomprehension_walk2(self, node):
"""List comprehensions the way they are done in Python 2. """List comprehensions the way they are done in Python 2 (and
some Python 3?).
They're more other comprehensions, e.g. set comprehensions They're more other comprehensions, e.g. set comprehensions
See if we can combine code. See if we can combine code.
""" """
@@ -1635,6 +1636,9 @@ class SourceWalker(GenericASTTraversal, object):
else: else:
ast = ast[0][0][0][0][0] ast = ast[0][0][0][0][0]
if ast == 'expr':
ast = ast[0]
n = ast[1] n = ast[1]
collection = node[-3] collection = node[-3]
list_if = None list_if = None