You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-03 16:59:52 +08:00
Fix some really weird Python 2.6 constructs
From 2.6's test grammar.
This commit is contained in:
BIN
test/bytecode_2.6/03_weird.pyc
Normal file
BIN
test/bytecode_2.6/03_weird.pyc
Normal file
Binary file not shown.
10
test/simple_source/bug26/03_weird.py
Normal file
10
test/simple_source/bug26/03_weird.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
# From Python 2.6 test_grammar where it says:
|
||||||
|
|
||||||
|
# Grammar allows multiple adjacent 'if's in listcomps and genexps,
|
||||||
|
# even though it's silly. Make sure it works (ifelse broke this.)
|
||||||
|
|
||||||
|
[ x for x in range(10) if x % 2 if x % 3 ]
|
||||||
|
list(x for x in range(10) if x % 2 if x % 3)
|
||||||
|
|
||||||
|
# FIXME
|
||||||
|
# (5 if 1 else max(5, 2))
|
@@ -84,7 +84,7 @@ class Python26Parser(Python2Parser):
|
|||||||
cf_jb_cf_pop ::= _come_froms JUMP_BACK come_froms POP_TOP
|
cf_jb_cf_pop ::= _come_froms JUMP_BACK come_froms POP_TOP
|
||||||
|
|
||||||
bp_come_from ::= POP_BLOCK COME_FROM
|
bp_come_from ::= POP_BLOCK COME_FROM
|
||||||
jb_bp_come_from ::= JUMP_BACK bp_come_from
|
jb_pb_come_from ::= JUMP_BACK bp_come_from
|
||||||
|
|
||||||
_ifstmts_jump ::= c_stmts_opt JUMP_FORWARD COME_FROM POP_TOP
|
_ifstmts_jump ::= c_stmts_opt JUMP_FORWARD COME_FROM POP_TOP
|
||||||
_ifstmts_jump ::= c_stmts_opt JUMP_FORWARD come_froms POP_TOP COME_FROM
|
_ifstmts_jump ::= c_stmts_opt JUMP_FORWARD come_froms POP_TOP COME_FROM
|
||||||
@@ -183,11 +183,21 @@ class Python26Parser(Python2Parser):
|
|||||||
|
|
||||||
# The JUMP FORWARD below jumps to the JUMP BACK. It seems to happen
|
# The JUMP FORWARD below jumps to the JUMP BACK. It seems to happen
|
||||||
# in rare cases that may have to with length of code
|
# in rare cases that may have to with length of code
|
||||||
|
# FIXME: we can add a reduction check for this
|
||||||
|
|
||||||
list_for ::= expr _for store list_iter JUMP_FORWARD come_froms POP_TOP
|
list_for ::= expr _for store list_iter JUMP_FORWARD come_froms POP_TOP
|
||||||
COME_FROM JUMP_BACK
|
COME_FROM JUMP_BACK
|
||||||
|
|
||||||
list_for ::= expr _for store list_iter jb_cont
|
list_for ::= expr _for store list_iter jb_cont
|
||||||
|
|
||||||
|
# This is for a really funky:
|
||||||
|
# [ x for x in range(10) if x % 2 if x % 3 ]
|
||||||
|
# the JUMP_ABSOLUTE is to the instruction after the last POP_TOP
|
||||||
|
# we have a reduction check for this
|
||||||
|
|
||||||
|
list_for ::= expr _for store list_iter JUMP_ABSOLUTE come_froms
|
||||||
|
POP_TOP jb_pop
|
||||||
|
|
||||||
list_iter ::= list_if JUMP_BACK
|
list_iter ::= list_if JUMP_BACK
|
||||||
list_iter ::= list_if JUMP_BACK COME_FROM POP_TOP
|
list_iter ::= list_if JUMP_BACK COME_FROM POP_TOP
|
||||||
list_comp ::= BUILD_LIST_0 DUP_TOP
|
list_comp ::= BUILD_LIST_0 DUP_TOP
|
||||||
@@ -197,17 +207,27 @@ class Python26Parser(Python2Parser):
|
|||||||
lc_body ::= LOAD_NAME expr LIST_APPEND
|
lc_body ::= LOAD_NAME expr LIST_APPEND
|
||||||
lc_body ::= LOAD_FAST expr LIST_APPEND
|
lc_body ::= LOAD_FAST expr LIST_APPEND
|
||||||
|
|
||||||
comp_for ::= SETUP_LOOP expr _for store comp_iter jb_bp_come_from
|
comp_for ::= SETUP_LOOP expr _for store comp_iter jb_pb_come_from
|
||||||
|
|
||||||
comp_body ::= gen_comp_body
|
comp_body ::= gen_comp_body
|
||||||
|
|
||||||
for_block ::= l_stmts_opt _come_froms POP_TOP JUMP_BACK
|
for_block ::= l_stmts_opt _come_froms POP_TOP JUMP_BACK
|
||||||
|
|
||||||
# Make sure we keep indices the same as 2.7
|
# Make sure we keep indices the same as 2.7
|
||||||
|
|
||||||
setup_loop_lf ::= SETUP_LOOP LOAD_FAST
|
setup_loop_lf ::= SETUP_LOOP LOAD_FAST
|
||||||
genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter jb_bp_come_from
|
genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter jb_pb_come_from
|
||||||
genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter JUMP_BACK come_from_pop
|
genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter JUMP_BACK come_from_pop
|
||||||
jb_bp_come_from
|
jb_pb_come_from
|
||||||
|
|
||||||
|
# This is for a really funky:
|
||||||
|
# (x for x in range(10) if x % 2 if x % 3 )
|
||||||
|
# the JUMP_ABSOLUTE is to the instruction after the last POP_TOP.
|
||||||
|
# Add a reduction check for this?
|
||||||
|
|
||||||
|
genexpr_func ::= setup_loop_lf FOR_ITER store comp_iter JUMP_ABSOLUTE come_froms
|
||||||
|
POP_TOP jb_pop jb_pb_come_from
|
||||||
|
|
||||||
generator_exp ::= LOAD_GENEXPR MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1 COME_FROM
|
generator_exp ::= LOAD_GENEXPR MAKE_FUNCTION_0 expr GET_ITER CALL_FUNCTION_1 COME_FROM
|
||||||
list_if ::= list_if ::= expr jmp_false_then list_iter
|
list_if ::= list_if ::= expr jmp_false_then list_iter
|
||||||
'''
|
'''
|
||||||
@@ -256,6 +276,7 @@ class Python26Parser(Python2Parser):
|
|||||||
""")
|
""")
|
||||||
super(Python26Parser, self).add_custom_rules(tokens, customize)
|
super(Python26Parser, self).add_custom_rules(tokens, customize)
|
||||||
self.check_reduce['and'] = 'AST'
|
self.check_reduce['and'] = 'AST'
|
||||||
|
self.check_reduce['list_for'] = 'AST'
|
||||||
|
|
||||||
def reduce_is_invalid(self, rule, ast, tokens, first, last):
|
def reduce_is_invalid(self, rule, ast, tokens, first, last):
|
||||||
invalid = super(Python26Parser,
|
invalid = super(Python26Parser,
|
||||||
@@ -275,6 +296,13 @@ class Python26Parser(Python2Parser):
|
|||||||
jmp_target = jmp_false.offset + jmp_false.attr + 3
|
jmp_target = jmp_false.offset + jmp_false.attr + 3
|
||||||
return not (jmp_target == tokens[last].offset or
|
return not (jmp_target == tokens[last].offset or
|
||||||
tokens[last].pattr == jmp_false.pattr)
|
tokens[last].pattr == jmp_false.pattr)
|
||||||
|
elif rule == (
|
||||||
|
'list_for',
|
||||||
|
('expr', '_for', 'store', 'list_iter',
|
||||||
|
'JUMP_ABSOLUTE', 'come_froms', 'POP_TOP', 'JUMP_BACK', 'POP_TOP')):
|
||||||
|
# The JUMP_ABSOLUTE has to be to the last POP_TOP or this is invalid
|
||||||
|
ja_attr = ast[4].attr
|
||||||
|
return tokens[last].offset != ja_attr
|
||||||
return False
|
return False
|
||||||
class Python26ParserSingle(Python2Parser, PythonParserSingle):
|
class Python26ParserSingle(Python2Parser, PythonParserSingle):
|
||||||
pass
|
pass
|
||||||
|
Reference in New Issue
Block a user