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

More specific 2.7 dictcomp and setcomp rules

Browse Source
This commit is contained in:
rocky
2017-11-26 15:06:45 -05:00
parent df2cda5b66
commit 6db5c63307
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
uncompyle6/parsers/parse2.py
View File

@@ -386,14 +386,20 @@ class Python2Parser(PythonParser):
('expr '*v, opname))], ('expr '*v, opname))],
customize) customize)
if self.version >= 2.7: if self.version >= 2.7:
self.add_unique_rules([ if i > 0:
('setcomp ::= %s load_closure LOAD_SETCOMP %s expr' prev_tok = tokens[i-1]
' GET_ITER CALL_FUNCTION_1' % if prev_tok == 'LOAD_DICTCOMP':
('expr '*v, opname)), self.add_unique_rules([
('dictcomp ::= %s load_closure LOAD_DICTCOMP %s expr' ('dictcomp ::= %s load_closure LOAD_DICTCOMP %s expr'
' GET_ITER CALL_FUNCTION_1' % ' GET_ITER CALL_FUNCTION_1' %
('expr '*v, opname))], ('expr '*v, opname))], customize)
customize) elif prev_tok == 'LOAD_SETCOMP':
self.add_unique_rules([
('setcomp ::= %s load_closure LOAD_SETCOMP %s expr'
' GET_ITER CALL_FUNCTION_1' %
('expr '*v, opname))
], customize)
pass
pass pass
continue continue
elif opname == 'SETUP_EXCEPT': elif opname == 'SETUP_EXCEPT':

1
uncompyle6/parsers/parse27.py
View File

@@ -123,6 +123,7 @@ class Python27Parser(Python2Parser):
self.remove_rules(""" self.remove_rules("""
while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM
while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suite COME_FROM while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suite COME_FROM
tryfinallystmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM suite_stmts_opt END_FINALLY
""") """)
super(Python27Parser, self).add_custom_rules(tokens, customize) super(Python27Parser, self).add_custom_rules(tokens, customize)
self.check_reduce['and'] = 'AST' self.check_reduce['and'] = 'AST'