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

handle newer parser reduction behavior

Browse Source
This commit is contained in:
rocky
2017-10-03 11:54:24 -04:00
parent eee751e22a
commit b1705e283d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uncompyle6/parsers/parse2.py
View File

@@ -395,8 +395,8 @@ class Python2Parser(PythonParser):
return return
def reduce_is_invalid(self, rule, ast, tokens, first, last): def reduce_is_invalid(self, rule, ast, tokens, first, last):
if not tokens: if tokens is None:
return return False
lhs = rule[0] lhs = rule[0]
if lhs in ('augassign1', 'augassign2') and ast[0][0] == 'and': if lhs in ('augassign1', 'augassign2') and ast[0][0] == 'and':
return True return True

2
uncompyle6/parsers/parse24.py
View File

@@ -55,7 +55,7 @@ class Python24Parser(Python25Parser):
invalid = super(Python24Parser, invalid = super(Python24Parser,
self).reduce_is_invalid(rule, ast, self).reduce_is_invalid(rule, ast,
tokens, first, last) tokens, first, last)
if invalid: if invalid or tokens is None:
return invalid return invalid
# FiXME: this code never gets called... # FiXME: this code never gets called...

2
uncompyle6/parsers/parse26.py
View File

@@ -258,7 +258,7 @@ class Python26Parser(Python2Parser):
invalid = super(Python26Parser, invalid = super(Python26Parser,
self).reduce_is_invalid(rule, ast, self).reduce_is_invalid(rule, ast,
tokens, first, last) tokens, first, last)
if invalid: if invalid or tokens is None:
return invalid return invalid
if rule == ('and', ('expr', 'jmp_false', 'expr', '\\e_come_from_opt')): if rule == ('and', ('expr', 'jmp_false', 'expr', '\\e_come_from_opt')):
# Test that jmp_false jumps to the end of "and" # Test that jmp_false jumps to the end of "and"