diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py index cac4649f..01e411a5 100644 --- a/uncompyle6/parsers/parse3.py +++ b/uncompyle6/parsers/parse3.py @@ -74,6 +74,7 @@ class Python3Parser(PythonParser): jb_or_c ::= JUMP_BACK jb_or_c ::= CONTINUE + jb_cfs ::= JUMP_BACK _come_froms stmt ::= set_comp_func @@ -435,10 +436,11 @@ class Python3Parser(PythonParser): while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suitel - whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK + whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_cfs POP_BLOCK else_suitel COME_FROM_LOOP - whileelsestmt2 ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK + + whileelsestmt2 ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK else_suitel JUMP_BACK COME_FROM_LOOP whileTruestmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py index eda5ea62..5dc6ab6f 100644 --- a/uncompyle6/scanners/scanner2.py +++ b/uncompyle6/scanners/scanner2.py @@ -396,7 +396,7 @@ class Scanner2(Scanner): if show_asm in ('both', 'after'): for t in tokens: - print(t.format(line_prefix='L.')) + print(t.format(line_prefix="")) print() return tokens, customize diff --git a/uncompyle6/scanners/scanner26.py b/uncompyle6/scanners/scanner26.py index 9f7658de..6c0ab135 100755 --- a/uncompyle6/scanners/scanner26.py +++ b/uncompyle6/scanners/scanner26.py @@ -279,7 +279,7 @@ class Scanner26(scan.Scanner2): if show_asm in ('both', 'after'): for t in tokens: - print(t.format(line_prefix='L.')) + print(t.format(line_prefix="")) print() return tokens, customize diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py index c7840dd9..921f8e05 100644 --- a/uncompyle6/scanners/scanner3.py +++ b/uncompyle6/scanners/scanner3.py @@ -539,7 +539,7 @@ class Scanner3(Scanner): if show_asm in ("both", "after"): for t in tokens: - print(t.format(line_prefix="L.")) + print(t.format(line_prefix=)) print() return tokens, customize diff --git a/uncompyle6/scanners/scanner37base.py b/uncompyle6/scanners/scanner37base.py index a51b3fa9..62da868f 100644 --- a/uncompyle6/scanners/scanner37base.py +++ b/uncompyle6/scanners/scanner37base.py @@ -518,7 +518,7 @@ class Scanner37Base(Scanner): if show_asm in ("both", "after"): for t in tokens: - print(t.format(line_prefix="L.")) + print(t.format(line_prefix="")) print() return tokens, customize