diff options
| author |   Benjamin Peterson <benjamin@python.org> | 2014-04-09 23:55:56 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-09 23:55:56 -0400 |
| commit | d51374ed78a3e3145911a16cdf3b9b84b3ba7d15 (patch) | |
| tree | 31f9086f20f5b8923604f41f1a4d139fa809aaed /Parser | |
| parent | Add algorithmic notes for nsmallest() and nlargest(). (diff) | |
| download | cpython-d51374ed78a3e3145911a16cdf3b9b84b3ba7d15.tar.gz cpython-d51374ed78a3e3145911a16cdf3b9b84b3ba7d15.tar.bz2 cpython-d51374ed78a3e3145911a16cdf3b9b84b3ba7d15.zip | |
PEP 465: a dedicated infix operator for matrix multiplication (closes #21176)
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/Python.asdl | 2 | ||||
| -rw-r--r-- | Parser/tokenizer.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Parser/Python.asdl b/Parser/Python.asdl index debd89edb85..792cab78e65 100644 --- a/Parser/Python.asdl +++ b/Parser/Python.asdl @@ -91,7 +91,7 @@ module Python boolop = And | Or - operator = Add | Sub | Mult | Div | Mod | Pow | LShift + operator = Add | Sub | Mult | MatMult | Div | Mod | Pow | LShift | RShift | BitOr | BitXor | BitAnd | FloorDiv unaryop = Invert | Not | UAdd | USub diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 7283058fc88..6aaa4a9d383 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -98,6 +98,7 @@ const char *_PyParser_TokenNames[] = { "DOUBLESLASH", "DOUBLESLASHEQUAL", "AT", + "ATEQUAL", "RARROW", "ELLIPSIS", /* This table must match the #defines in token.h! */ @@ -1131,7 +1132,7 @@ PyToken_OneChar(int c) case '}': return RBRACE; case '^': return CIRCUMFLEX; case '~': return TILDE; - case '@': return AT; + case '@': return AT; default: return OP; } } @@ -1207,6 +1208,11 @@ PyToken_TwoChars(int c1, int c2) case '=': return CIRCUMFLEXEQUAL; } break; + case '@': + switch (c2) { + case '=': return ATEQUAL; + } + break; } return OP; } |