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

More Python 3.0 parse errors

Browse Source
This commit is contained in:
rocky
2018-06-23 13:31:16 -04:00
parent 8d1bd6d5b5
commit bc16cc93d6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uncompyle6/parsers/parse26.py
View File

@@ -265,11 +265,11 @@ class Python26Parser(Python2Parser):
kvlist ::= kvlist kv3 kvlist ::= kvlist kv3
# Note: preserve positions 0 2 and 4 for semantic actions # Note: preserve positions 0 2 and 4 for semantic actions
conditional_not ::= expr jmp_true expr jf_cf_pop expr COME_FROM conditional_not : := expr jmp_true expr jf_cf_pop expr COME_FROM
conditional ::= expr jmp_false expr jf_cf_pop expr come_from_opt conditional ::= expr jmp_false expr jf_cf_pop expr come_from_opt
expr ::= conditional_not expr ::= conditional_not
and ::= expr JUMP_IF_FALSE POP_TOP expr JUMP_IF_FALSE POP_TOP and ::= expr JUMP_IF_FALSE POP_TOP expr JUMP_IF_FALSE POP_TOP
# compare_chained is like x <= y <= z # compare_chained is like x <= y <= z
compare_chained ::= expr compare_chained1 ROT_TWO COME_FROM POP_TOP _come_froms compare_chained ::= expr compare_chained1 ROT_TWO COME_FROM POP_TOP _come_froms

7
uncompyle6/parsers/parse30.py
View File

@@ -59,6 +59,7 @@ class Python30Parser(Python31Parser):
JUMP_BACK JUMP_BACK
# JUMP_IF_TRUE POP_TOP as a replacement
comp_if ::= expr jmp_false comp_iter comp_if ::= expr jmp_false comp_iter
comp_iter ::= expr expr SET_ADD comp_iter ::= expr expr SET_ADD
comp_iter ::= expr expr LIST_APPEND comp_iter ::= expr expr LIST_APPEND
@@ -69,12 +70,16 @@ class Python30Parser(Python31Parser):
except_suite_finalize ::= SETUP_FINALLY c_stmts_opt except_var_finalize END_FINALLY except_suite_finalize ::= SETUP_FINALLY c_stmts_opt except_var_finalize END_FINALLY
_jump POP_TOP _jump POP_TOP
jump_except ::= JUMP_FORWARD POP_TOP jump_except ::= JUMP_FORWARD POP_TOP
or ::= expr jmp_false expr jmp_true expr
################################################################################ ################################################################################
# In many ways 3.0 is like 2.6. The below rules in fact are the same or similar. # In many ways 3.0 is like 2.6. One similarity is there is no JUMP_IF_TRUE and
# JUMP_IF_FALSE
# The below rules in fact are the same or similar.
jmp_true ::= JUMP_IF_TRUE POP_TOP jmp_true ::= JUMP_IF_TRUE POP_TOP
jmp_false ::= JUMP_IF_FALSE POP_TOP jmp_false ::= JUMP_IF_FALSE POP_TOP
for_block ::= l_stmts_opt _come_froms POP_TOP JUMP_BACK for_block ::= l_stmts_opt _come_froms POP_TOP JUMP_BACK
except_handler ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts except_handler ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts

5
uncompyle6/semantics/pysource.py
View File

@@ -1170,6 +1170,11 @@ class SourceWalker(GenericASTTraversal, object):
# collection = node[-3] # collection = node[-3]
collections = [node[-3]] collections = [node[-3]]
list_ifs = [] list_ifs = []
if self.version == 3.0 and n != 'list_iter':
# FIXME 3.0 is a snowflake here. We'll need
# special code for this
return
assert n == 'list_iter' assert n == 'list_iter'
stores = [] stores = []