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

Python 3.0 chained comparisions

Browse Source
This commit is contained in:
rocky
2018-06-23 07:37:47 -04:00
parent fb31fe1f35
commit c148e49670
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Makefile
View File

@@ -225,11 +225,7 @@ check-bytecode-2.7:
#: Check deparsing Python 3.0
check-bytecode-3.0:
$(PYTHON) test_pythonlib.py --bytecode-3.0 --weak-verify
#: Check deparsing Python 3.0
check-bytecode-3.0:
$(PYTHON) test_pythonlib.py --bytecode-3.0 --weak-verify
# $(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
$(PYTHON) test_pythonlib.py --bytecode-3.0-run --verify-run
#: Check deparsing Python 3.1
check-bytecode-3.1:

BIN
test/bytecode_3.0_run/00_assign.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_3.0_run/00_chained-compare.pyc Normal file
View File

Binary file not shown.

6
test/simple_source/bug30/00_chained-compare.py Normal file
View File

@@ -0,0 +1,6 @@
# From 3.0 asyncore.py
# This is RUNNABLE!
r, w, e = ([], [], [])
if [] == r == w == e:
r = [1]
assert r == [1]

7
uncompyle6/parsers/parse26.py
View File

@@ -273,14 +273,13 @@ class Python26Parser(Python2Parser):
# compare_chained is like x <= y <= z
compare_chained ::= expr compare_chained1 ROT_TWO COME_FROM POP_TOP _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false_then compare_chained1 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false_then compare_chained2 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false compare_chained1 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false compare_chained2 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false_then compare_chained1 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false_then compare_chained2 _come_froms

18
uncompyle6/parsers/parse30.py
View File

@@ -14,8 +14,6 @@ class Python30Parser(Python31Parser):
assert ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1 POP_TOP
return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
JUMP_IF_FALSE POP_TOP compare_chained2
compare_chained2 ::= expr COMPARE_OP RETURN_END_IF_LAMBDA
# FIXME: combine with parse3.2
@@ -72,6 +70,7 @@ class Python30Parser(Python31Parser):
_jump POP_TOP
jump_except ::= JUMP_FORWARD POP_TOP
################################################################################
# In many ways 3.0 is like 2.6. The below rules in fact are the same or similar.
jmp_true ::= JUMP_IF_TRUE POP_TOP
@@ -87,6 +86,13 @@ class Python30Parser(Python31Parser):
JUMP_BACK POP_TOP POP_BLOCK COME_FROM_LOOP
whilestmt ::= SETUP_LOOP testexpr returns
POP_TOP POP_BLOCK COME_FROM_LOOP
# compare_chained is like x <= y <= z
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false compare_chained1 _come_froms
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP
jmp_false compare_chained2 _come_froms
"""
def customize_grammar_rules(self, tokens, customize):
@@ -104,9 +110,15 @@ class Python30Parser(Python31Parser):
POP_BLOCK COME_FROM_LOOP
assert ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1
return_if_lambda ::= RETURN_END_IF_LAMBDA
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP JUMP_IF_FALSE_OR_POP compare_chained2 COME_FROM
except_handler ::= jmp_abs COME_FROM_EXCEPT except_stmts END_FINALLY
except_suite ::= c_stmts POP_EXCEPT jump_except
# No JUMP_IF_FALSE_OR_POP
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP JUMP_IF_FALSE_OR_POP
compare_chained1 COME_FROM
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP JUMP_IF_FALSE_OR_POP
compare_chained2 COME_FROM
""")
return