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

WIP: Python3 exceptions

Browse Source
This commit is contained in:
rocky
2015-12-23 20:08:07 -05:00
parent d47415a677
commit 0c45fcfab9
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.4/01_try_except.pyc
View File

Binary file not shown.

4
test/simple_source/exception/05_try_except.py Normal file
View File

@@ -0,0 +1,4 @@
try:
pass
except ImportError as exc:
pass

30
uncompyle6/parsers/parse3.py
View File

@@ -425,11 +425,21 @@ class Python3Parser(PythonParser):
ifelsestmtl ::= testexpr c_stmts_opt JUMP_BACK else_suitel
trystmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle COME_FROM
trystmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle COME_FROM
tryelsestmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle else_suite COME_FROM
tryfinallystmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle
POP_TOP SETUP_FINALLY POP_BLOCK POP_EXCEPT LOAD_CONST
COME_FROM suite_stmts END_FINALLY
JUMP_FORWARD END_FINALLY COME_FROM COME_FROM
tryfinallystmt ::= SETUP_FINALLY suite_stmts
POP_BLOCK LOAD_CONST
COME_FROM suite_stmts END_FINALLY
tryelsestmt ::= SETUP_EXCEPT suite_stmts_opt
try_middle else_suite COME_FROM
tryelsestmtc ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle else_suitec COME_FROM
@@ -437,16 +447,18 @@ class Python3Parser(PythonParser):
tryelsestmtl ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle else_suitel COME_FROM
try_middle ::= jmp_abs COME_FROM except_stmts
END_FINALLY
try_middle ::= jmp_abs COME_FROM except_stmts END_FINALLY
try_middle ::= JUMP_FORWARD COME_FROM except_stmts
END_FINALLY COME_FROM
END_FINALLY COME_FROM
try_middle ::= JUMP_FORWARD COME_FROM except_cond2
except_stmts ::= except_stmts except_stmt
except_stmts ::= except_stmt
except_stmt ::= except_cond1 except_suite
except_stmt ::= except_cond2 except_suite
except_stmt ::= except_cond2 except_suite
except_stmt ::= except
# Python3 introduced POP_EXCEPT
@@ -468,10 +480,6 @@ class Python3Parser(PythonParser):
jmp_abs ::= JUMP_ABSOLUTE
jmp_abs ::= JUMP_BACK
tryfinallystmt ::= SETUP_FINALLY suite_stmts
POP_BLOCK LOAD_CONST
COME_FROM suite_stmts_opt END_FINALLY
withstmt ::= expr SETUP_WITH POP_TOP suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM
WITH_CLEANUP END_FINALLY