Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2017-12-09 04:53:21 -05:00
29 changed files with 143 additions and 7854 deletions

View File

@@ -60,14 +60,14 @@ class Python2Parser(PythonParser):
return_stmt_lambda ::= ret_expr RETURN_VALUE_LAMBDA
stmt ::= break_stmt
break_stmt ::= BREAK_LOOP
stmt ::= break
break ::= BREAK_LOOP
stmt ::= continue_stmt
continue_stmt ::= CONTINUE
continue_stmts ::= _stmts lastl_stmt continue_stmt
continue_stmts ::= lastl_stmt continue_stmt
continue_stmts ::= continue_stmt
stmt ::= continue
continue ::= CONTINUE
continues ::= _stmts lastl_stmt continue
continues ::= lastl_stmt continue
continues ::= continue
stmt ::= assert2
stmt ::= raise_stmt0
@@ -131,6 +131,8 @@ class Python2Parser(PythonParser):
POP_BLOCK LOAD_CONST
COME_FROM suite_stmts_opt END_FINALLY
lastc_stmt ::= tryelsestmtc
# Move to 2.7? 2.6 may use come_froms
tryelsestmtc ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
except_handler else_suitec COME_FROM
@@ -337,7 +339,7 @@ class Python2Parser(PythonParser):
rule = 'call ::= expr ' + 'expr '*args_pos + 'kwarg '*args_kw \
+ 'expr ' * nak + opname
elif opname == 'CONTINUE_LOOP':
self.add_unique_rule('continue_stmt ::= CONTINUE_LOOP',
self.add_unique_rule('continue ::= CONTINUE_LOOP',
opname, v, customize)
continue
elif opname_base in ('DUP_TOPX', 'RAISE_VARARGS'):