Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-12-03 11:19:48 -05:00
22 changed files with 205 additions and 153 deletions

View File

@@ -64,14 +64,14 @@ class Python36Parser(Python35Parser):
# In 3.6+, A sequence of statements ending in a RETURN can cause
# JUMP_FORWARD END_FINALLY to be omitted from try middle
except_return ::= POP_TOP POP_TOP POP_TOP return_stmts
try_middle ::= JUMP_FORWARD COME_FROM_EXCEPT except_return
except_return ::= POP_TOP POP_TOP POP_TOP return_stmts
except_handler ::= JUMP_FORWARD COME_FROM_EXCEPT except_return
# Try middle following a return_stmts
try_middle36 ::= COME_FROM_EXCEPT except_stmts END_FINALLY
except_handler36 ::= COME_FROM_EXCEPT except_stmts END_FINALLY
stmt ::= try_except36
try_except36 ::= SETUP_EXCEPT return_stmts try_middle36 opt_come_from_except
stmt ::= try_except36
try_except36 ::= SETUP_EXCEPT return_stmts except_handler36 opt_come_from_except
"""
def add_custom_rules(self, tokens, customize):