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

More 3.0 control-flow rules...

Browse Source 
Much more is needed though
This commit is contained in:
rocky
2019-11-11 19:07:58 -05:00
parent 1419acf019
commit 4abdffecb9
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.0/02_while1_if_while1.pyc
View File

Binary file not shown.

5
test/simple_source/bug30/02_while1_if_while1.py
View File

@@ -7,3 +7,8 @@ while 1:
raise RuntimeError
else:
raise RuntimeError
# Adapted from 3.0.1 cgi.py
def _parseparam(s, end):
while end > 0 and s.count(''):
end = s.find(';')

30
uncompyle6/parsers/parse30.py
View File

@@ -135,11 +135,12 @@ class Python30Parser(Python31Parser):
return_if_stmt ::= ret_expr RETURN_END_IF COME_FROM POP_TOP
and ::= expr jmp_false expr come_from_opt
whilestmt ::= SETUP_LOOP testexpr l_stmts_opt come_from_opt
JUMP_BACK COME_FROM POP_TOP POP_BLOCK COME_FROM_LOOP
JUMP_BACK come_froms 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
@@ -174,7 +175,34 @@ class Python30Parser(Python31Parser):
compare_chained2 COME_FROM
""")
self.check_reduce['iflaststmtl'] = 'AST'
# self.check_reduce['ifelsestmt'] = 'AST'
return
def reduce_is_invalid(self, rule, ast, tokens, first, last):
invalid = super(Python30Parser,
self).reduce_is_invalid(rule, ast,
tokens, first, last)
if invalid:
return invalid
if (
rule[0] in ("iflaststmtl",) and ast[0] == "testexpr"
):
testexpr = ast[0]
if testexpr[0] == "testfalse":
testfalse = testexpr[0]
if testfalse[1] == "jmp_false":
jmp_false = testfalse[1]
if last == len(tokens):
last -= 1
while (isinstance(tokens[first].offset, str) and first < last):
first += 1
if first == last:
return True
while (first < last and isinstance(tokens[last].offset, str)):
last -= 1
return not (tokens[first].offset <= jmp_false[0].attr <= tokens[last].offset)
pass
class Python30ParserSingle(Python30Parser, PythonParserSingle):