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

Revert augassign change but..

Browse Source 
Make note of what's going on and add grammar test for bad
situations we have in Python 2.6 (and perhaps others)
This commit is contained in:
rocky
2016-11-11 09:08:02 -05:00
parent f4999f6300
commit 50c2e1bda9
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uncompyle6/parser.py
View File

@@ -265,10 +265,14 @@ class PythonParser(GenericASTBuilder):
def p_augmented_assign(self, args):
'''
stmt ::= augassign0
stmt ::= augassign1
stmt ::= augassign2
augassign0 ::= expr expr inplace_op designator
# This is odd in that other augassign1's have only 3 slots
# The designator isn't used as that's supposed to be also
# indicated in the first expr
augassign1 ::= expr expr inplace_op designator
augassign1 ::= expr expr inplace_op ROT_THREE STORE_SUBSCR
augassign2 ::= expr DUP_TOP LOAD_ATTR expr
inplace_op ROT_TWO STORE_ATTR

5
uncompyle6/semantics/check_ast.py
View File

@@ -12,6 +12,11 @@ def checker(ast, in_loop, errors):
in_loop = in_loop or ast.type in ('while1stmt', 'whileTruestmt',
'whilestmt', 'whileelsestmt',
'for_block')
if ast.type == 'augassign1' and ast[0][0] == 'and':
text = str(ast[0])
error_text = '\n# improper augmented assigment:\n#\t' + '\n# '.join(text.split("\n"))
errors.append(error_text)
for node in ast:
if not in_loop and node.type in ('continue_stmt', 'break_stmt'):
text = str(node)

2
uncompyle6/semantics/fragments.py
View File

@@ -1772,7 +1772,7 @@ def deparse_code(version, co, out=StringIO(), showasm=False, showast=False,
if deparsed.ast_errors:
deparsed.write("# NOTE: have decompilation errors.\n")
deparsed.write("# Use -t option to show context of errors.")
deparsed.write("# Use -t option to show full of errors.")
for err in deparsed.ast_errors:
deparsed.write(err)
deparsed.ERROR = True

8
uncompyle6/semantics/pysource.py
View File

@@ -239,8 +239,12 @@ TABLE_DIRECT = {
'dict_comp_body': ( '%c:%c', 1, 0 ),
'assign': ( '%|%c = %p\n', -1, (0, 200) ),
'augassign0': ( '%|%c = %c %c %c\n', 3, 0, 2, 1),
# The 2nd parameter should have a = suffix.
# There is a rule with a 4th parameter "designator"
# which we don't use here.
'augassign1': ( '%|%c %c %c\n', 0, 2, 1),
'augassign2': ( '%|%c.%[2]{pattr} %c %c\n', 0, -3, -4),
'designList': ( '%c = %c', 0, -1 ),
'and': ( '%c and %c', 0, 2 ),
@@ -2318,7 +2322,7 @@ def deparse_code(version, co, out=sys.stdout, showasm=None, showast=False,
if deparsed.ast_errors:
deparsed.write("# NOTE: have decompilation errors.\n")
deparsed.write("# Use -t option to show context of errors.")
deparsed.write("# Use -t option to full context of errors.")
for err in deparsed.ast_errors:
deparsed.write(err)
raise SourceWalkerError("Deparsing hit an internal grammar-rule bug")