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

Expand grammar check for ifelse continue for 2.7

Browse Source
This commit is contained in:
rocky
2024-07-12 21:30:46 -04:00
parent 703716ca6f
commit b28f3058fc
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
uncompyle6/parsers/reducecheck/ifelsestmt.py
View File

@@ -82,14 +82,8 @@ IFELSE_STMT_RULES = frozenset(
), ),
), ),
( (
'ifelsestmtc', "ifelsestmtc",
( ("testexpr", "c_stmts_opt", "JUMP_FORWARD", "else_suite", "come_froms"),
'testexpr',
'c_stmts_opt',
'JUMP_FORWARD',
'else_suite',
'come_froms'
),
), ),
( (
"ifelsestmt", "ifelsestmt",
@@ -155,7 +149,6 @@ IFELSE_STMT_RULES = frozenset(
def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last): def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
if (last + 1) < n and tokens[last + 1] == "COME_FROM_LOOP" and lhs != "ifelsestmtc": if (last + 1) < n and tokens[last + 1] == "COME_FROM_LOOP" and lhs != "ifelsestmtc":
# ifelsestmt jumped outside of loop. No good. # ifelsestmt jumped outside of loop. No good.
return True return True
@@ -176,10 +169,7 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
stmts = tree[1] stmts = tree[1]
if stmts in ("c_stmts",) and len(stmts) == 1: if stmts in ("c_stmts",) and len(stmts) == 1:
raise_stmt1 = stmts[0] raise_stmt1 = stmts[0]
if ( if raise_stmt1 == "raise_stmt1" and raise_stmt1[0] in ("LOAD_ASSERT",):
raise_stmt1 == "raise_stmt1" and
raise_stmt1[0] in ("LOAD_ASSERT",)
):
return True return True
# Make sure all the offsets from the "come froms" at the # Make sure all the offsets from the "come froms" at the
@@ -277,17 +267,18 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
# only if we are trying to match or reduce an "if" # only if we are trying to match or reduce an "if"
# statement of the kind that can occur only inside a # statement of the kind that can occur only inside a
# loop construct. # loop construct.
if lhs in ("ifelsestmtl", "ifelsestmtc"): if lhs in ("ifelsestmtl", "ifelsestmtc"):
jump_false = jmp jump_false = jmp
if ( if (
tree[2].kind == "JUMP_FORWARD" tree[2].kind in ("JUMP_FORWARD", "JUMP_ABSOLUTE")
and jump_false == "jmp_false" and jump_false == "jmp_false"
and len(else_suite) == 1 and len(else_suite) == 1
): ):
suite_stmts = else_suite[0] suite_stmts = else_suite[0]
continue_stmt = suite_stmts[0] continue_stmt = suite_stmts[0]
if ( if (
suite_stmts == "suite_stmts" suite_stmts in ("suite_stmts", "c_stmts")
and len(suite_stmts) == 1 and len(suite_stmts) == 1
and continue_stmt == "continue" and continue_stmt == "continue"
and jump_false[0].attr == continue_stmt[0].attr and jump_false[0].attr == continue_stmt[0].attr

2
uncompyle6/scanners/scanner2.py
View File

@@ -213,7 +213,7 @@ class Scanner2(Scanner):
names=co.co_names, names=co.co_names,
constants=co.co_consts, constants=co.co_consts,
cells=bytecode._cell_names, cells=bytecode._cell_names,
linestarts=bytecode._linestarts, line_starts=bytecode._linestarts,
asm_format="extended", asm_format="extended",
) )