diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-23 20:10:25 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-23 20:10:25 -0600 |
| commit | c0e7bbf94ca6eba9dcb84d46f7ea145c623e81fe (patch) | |
| tree | 5d24621d128569091d3199d4a17b8f410f3e5387 /Python/ast.c | |
| parent | a86af85bf732659baa385d860cc6ca8ff98a6f30 (diff) | |
| parent | f6f0dfea16bf8d43c011bec4783dd430e87b5830 (diff) | |
| download | cpython-c0e7bbf94ca6eba9dcb84d46f7ea145c623e81fe.tar.gz | |
merge 3.4 (null)
Diffstat (limited to 'Python/ast.c')
| -rw-r--r-- | Python/ast.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Python/ast.c b/Python/ast.c index 5668755346..d6bddf1192 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -825,6 +825,8 @@ get_operator(const node *n) return Sub; case STAR: return Mult; + case AT: + return MatMult; case SLASH: return Div; case DOUBLESLASH: @@ -1030,6 +1032,8 @@ ast_for_augassign(struct compiling *c, const node *n) return Pow; else return Mult; + case '@': + return MatMult; default: PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n)); return (operator_ty)0; @@ -2266,7 +2270,7 @@ ast_for_expr(struct compiling *c, const node *n) and_expr: shift_expr ('&' shift_expr)* shift_expr: arith_expr (('<<'|'>>') arith_expr)* arith_expr: term (('+'|'-') term)* - term: factor (('*'|'/'|'%'|'//') factor)* + term: factor (('*'|'@'|'/'|'%'|'//') factor)* factor: ('+'|'-'|'~') factor | power power: atom trailer* ('**' factor)* */ @@ -2577,7 +2581,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n) /* expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | ('=' (yield_expr|testlist))*) testlist_star_expr: (test|star_expr) (',' test|star_expr)* [','] - augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' + augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=' test: ... here starts the operator precendence dance */ |