[pypy-commit] pypy py3.5: Add inplace matmul in opcode assignment and operator module

[raffael_t]

Author: Raffael Tfirst <raffael.tfirst at gmail.com>
Branch: py3.5
Changeset: r84520:b8deb0af7c9d
Date: 2016-05-19 13:40 +0200
http://bitbucket.org/pypy/pypy/changeset/b8deb0af7c9d/

Log:	Add inplace matmul in opcode assignment and operator module

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -306,6 +306,8 @@
                 self.INPLACE_FLOOR_DIVIDE(oparg, next_instr)
             elif opcode == opcodedesc.INPLACE_LSHIFT.index:
                 self.INPLACE_LSHIFT(oparg, next_instr)
+            elif opcode == opcodedesc.INPLACE_MATRIX_MULTIPLY.index:
+                self.INPLACE_MATRIX_MULTIPLY(oparg, next_instr)
             elif opcode == opcodedesc.INPLACE_MODULO.index:
                 self.INPLACE_MODULO(oparg, next_instr)
             elif opcode == opcodedesc.INPLACE_MULTIPLY.index:
diff --git a/pypy/module/operator/__init__.py b/pypy/module/operator/__init__.py
--- a/pypy/module/operator/__init__.py
+++ b/pypy/module/operator/__init__.py
@@ -31,8 +31,8 @@
                     'sub', 'truediv', 'matmul', 'truth', 'xor',
                     'iadd', 'iand', 'iconcat', 'ifloordiv',
                     'ilshift', 'imod', 'imul', 'ior', 'ipow',
-                    'irshift', 'isub', 'itruediv', 'ixor', '_length_hint',
-                    'indexOf']
+                    'irshift', 'isub', 'itruediv', 'imatmul', 'ixor',
+                    '_length_hint', 'indexOf']
 
     interpleveldefs = {
         '_compare_digest': 'tscmp.compare_digest',
@@ -87,5 +87,6 @@
         '__isub__' : 'isub',
         '__itruediv__' : 'itruediv',
         '__ixor__' : 'ixor',
+        '__imatmul__' : 'imatmul',
     }