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

opt_come_from_loop -> come_from_loops...

Browse Source 
ANd remove unused rules associated with COME_FROM_FINALLY
This commit is contained in:
rocky
2017-12-01 21:46:56 -05:00
parent 03a5ad3d94
commit ad822c02d8
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
uncompyle6/parsers/parse3.py
View File

@@ -184,7 +184,7 @@ class Python3Parser(PythonParser):
# this is nested inside a trystmt # this is nested inside a trystmt
tryfinallystmt ::= SETUP_FINALLY suite_stmts_opt tryfinallystmt ::= SETUP_FINALLY suite_stmts_opt
POP_BLOCK LOAD_CONST POP_BLOCK LOAD_CONST
come_from_or_finally suite_stmts_opt END_FINALLY COME_FROM_FINALLY suite_stmts_opt END_FINALLY
tryelsestmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK tryelsestmt ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
try_middle else_suite come_from_except_clauses try_middle else_suite come_from_except_clauses
@@ -232,7 +232,7 @@ class Python3Parser(PythonParser):
except_suite_finalize ::= SETUP_FINALLY c_stmts_opt except_var_finalize except_suite_finalize ::= SETUP_FINALLY c_stmts_opt except_var_finalize
END_FINALLY _jump END_FINALLY _jump
except_var_finalize ::= POP_BLOCK POP_EXCEPT LOAD_CONST come_from_or_finally except_var_finalize ::= POP_BLOCK POP_EXCEPT LOAD_CONST COME_FROM_FINALLY
LOAD_CONST store del_stmt LOAD_CONST store del_stmt
except_suite ::= return_stmts except_suite ::= return_stmts
@@ -274,7 +274,7 @@ class Python3Parser(PythonParser):
try_middle ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts try_middle ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts
END_FINALLY COME_FROM_EXCEPT_CLAUSE END_FINALLY COME_FROM_EXCEPT_CLAUSE
for_block ::= l_stmts_opt opt_come_from_loop JUMP_BACK for_block ::= l_stmts_opt come_from_loops JUMP_BACK
for_block ::= l_stmts for_block ::= l_stmts
iflaststmtl ::= testexpr c_stmts_opt iflaststmtl ::= testexpr c_stmts_opt
@@ -308,17 +308,9 @@ class Python3Parser(PythonParser):
opt_come_from_except ::= come_froms opt_come_from_except ::= come_froms
opt_come_from_except ::= come_from_except_clauses opt_come_from_except ::= come_from_except_clauses
come_froms ::= COME_FROM* come_froms ::= COME_FROM*
come_from_except_clauses ::= COME_FROM_EXCEPT_CLAUSE+ come_from_except_clauses ::= COME_FROM_EXCEPT_CLAUSE+
come_from_loops ::= COME_FROM_LOOP*
opt_come_from_loop ::= opt_come_from_loop COME_FROM_LOOP
opt_come_from_loop ::= opt_come_from_loop COME_FROM_LOOP
opt_come_from_loop ::=
come_from_or_finally ::= COME_FROM_FINALLY
come_from_or_finally ::= COME_FROM
""" """
def p_jump3(self, args): def p_jump3(self, args):
@@ -353,7 +345,7 @@ class Python3Parser(PythonParser):
def p_loop_stmt3(self, args): def p_loop_stmt3(self, args):
""" """
forstmt ::= SETUP_LOOP expr _for store for_block POP_BLOCK forstmt ::= SETUP_LOOP expr _for store for_block POP_BLOCK
opt_come_from_loop come_from_loops
forelsestmt ::= SETUP_LOOP expr _for store for_block POP_BLOCK else_suite forelsestmt ::= SETUP_LOOP expr _for store for_block POP_BLOCK else_suite
COME_FROM_LOOP COME_FROM_LOOP

4
uncompyle6/parsers/parse35.py
View File

@@ -82,7 +82,7 @@ class Python35Parser(Python34Parser):
POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK
JUMP_ABSOLUTE END_FINALLY COME_FROM JUMP_ABSOLUTE END_FINALLY COME_FROM
for_block POP_BLOCK JUMP_ABSOLUTE for_block POP_BLOCK JUMP_ABSOLUTE
opt_come_from_loop come_from_loops
async_for_stmt ::= SETUP_LOOP expr async_for_stmt ::= SETUP_LOOP expr
GET_AITER GET_AITER
@@ -94,7 +94,7 @@ class Python35Parser(Python34Parser):
POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK
JUMP_ABSOLUTE END_FINALLY JUMP_BACK JUMP_ABSOLUTE END_FINALLY JUMP_BACK
passstmt POP_BLOCK JUMP_ABSOLUTE passstmt POP_BLOCK JUMP_ABSOLUTE
opt_come_from_loop come_from_loops
stmt ::= async_forelse_stmt stmt ::= async_forelse_stmt
async_forelse_stmt ::= SETUP_LOOP expr async_forelse_stmt ::= SETUP_LOOP expr