diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-09-13 01:45:50 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-09-13 01:45:50 -0400 |
| commit | 0675102eeb39b5bf471af40e8af6729102fccc6b (patch) | |
| tree | 30165ba711d7216908c6c09f925957551e22f9f6 /Python/compile.c | |
| parent | 76b535066e42ee3d95502dd99ebbc6a05e7fdd87 (diff) | |
| parent | 2fa00f40169bd7f8c5881a0aeb857d0a847f9017 (diff) | |
| download | cpython-0675102eeb39b5bf471af40e8af6729102fccc6b.tar.gz | |
merge 3.4
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Python/compile.c b/Python/compile.c index 69419ecddc..9cc13995ef 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -881,6 +881,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case BINARY_POWER: case BINARY_MULTIPLY: + case BINARY_MATRIX_MULTIPLY: case BINARY_MODULO: case BINARY_ADD: case BINARY_SUBTRACT: @@ -895,6 +896,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case INPLACE_ADD: case INPLACE_SUBTRACT: case INPLACE_MULTIPLY: + case INPLACE_MATRIX_MULTIPLY: case INPLACE_MODULO: return -1; case STORE_SUBSCR: @@ -2625,6 +2627,8 @@ binop(struct compiler *c, operator_ty op) return BINARY_SUBTRACT; case Mult: return BINARY_MULTIPLY; + case MatMult: + return BINARY_MATRIX_MULTIPLY; case Div: return BINARY_TRUE_DIVIDE; case Mod: @@ -2689,6 +2693,8 @@ inplace_binop(struct compiler *c, operator_ty op) return INPLACE_SUBTRACT; case Mult: return INPLACE_MULTIPLY; + case MatMult: + return INPLACE_MATRIX_MULTIPLY; case Div: return INPLACE_TRUE_DIVIDE; case Mod: |