diff options
| author | Larry Hastings <larry@hastings.org> | 2014-10-08 02:56:18 -0700 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-10-08 02:56:18 -0700 |
| commit | 4cc877a2979973fbe29699373c1bcf7b7986def7 (patch) | |
| tree | 0772a680b7c42562c1437f05e5108a093e633efc /Python/compile.c | |
| parent | 2ea0a2fd4181bc5c0919c214ac39e2f4e74cb00f (diff) | |
| parent | af0652aadb61d3b2ed9989e138736db90236fd97 (diff) | |
| download | cpython-4cc877a2979973fbe29699373c1bcf7b7986def7.tar.gz | |
Mostly-null-merge from 3.4 branch following 3.4.2 release.
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Python/compile.c b/Python/compile.c index 69419ecddc..e46ec6ceda 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: @@ -1938,7 +1940,7 @@ compiler_if(struct compiler *c, stmt_ty s) } else if (constant == 1) { VISIT_SEQ(c, stmt, s->v.If.body); } else { - if (s->v.If.orelse) { + if (asdl_seq_LEN(s->v.If.orelse)) { next = compiler_new_block(c); if (next == NULL) return 0; @@ -1948,8 +1950,8 @@ compiler_if(struct compiler *c, stmt_ty s) VISIT(c, expr, s->v.If.test); ADDOP_JABS(c, POP_JUMP_IF_FALSE, next); VISIT_SEQ(c, stmt, s->v.If.body); - ADDOP_JREL(c, JUMP_FORWARD, end); - if (s->v.If.orelse) { + if (asdl_seq_LEN(s->v.If.orelse)) { + ADDOP_JREL(c, JUMP_FORWARD, end); compiler_use_next_block(c, next); VISIT_SEQ(c, stmt, s->v.If.orelse); } @@ -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: |