Implement __matmul__ method with @ operator

stjordanis · Jun 24, 2019 · 82e03b8 · 82e03b8
1 parent 7264ca7
commit 82e03b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/abstract.js b/src/abstract.js
@@ -55,6 +55,8 @@ Sk.abstr.boNameToSlotFuncLhs_ = function (obj, name) {
             return obj.nb$subtract ? obj.nb$subtract : obj["__sub__"];
         case "Mult":
             return obj.nb$multiply ? obj.nb$multiply : obj["__mul__"];
+        case "MatMult":
+            return obj.tp$matmul ? obj.tp$matmul : obj["__matmul__"];
         case "Div":
             return obj.nb$divide ? obj.nb$divide : obj["__div__"];
         case "FloorDiv":

diff --git a/src/ast.js b/src/ast.js
@@ -242,6 +242,7 @@ var operatorMap = {};
     operatorMap[TOK.T_PLUS] = Sk.astnodes.Add;
     operatorMap[TOK.T_MINUS] = Sk.astnodes.Sub;
     operatorMap[TOK.T_STAR] = Sk.astnodes.Mult;
+    operatorMap[TOK.T_AT] = Sk.astnodes.MatMult;
     operatorMap[TOK.T_SLASH] = Sk.astnodes.Div;
     operatorMap[TOK.T_DOUBLESLASH] = Sk.astnodes.FloorDiv;
     operatorMap[TOK.T_PERCENT] = Sk.astnodes.Mod;
@@ -2019,6 +2020,8 @@ function astForAugassign (c, n) {
                 return Sk.astnodes.Pow;
             }
             return Sk.astnodes.Mult;
+        case "@":
+            return Sk.astnodes.MatMult;
         default:
             Sk.asserts.fail("invalid augassign");
     }

diff --git a/src/type.js b/src/type.js
@@ -29,6 +29,7 @@ Sk.dunderToSkulpt = {
     "__gt__": "ob$gt",
     "__ge__": "ob$ge",
     "__hash__": "tp$hash",
+    "__matmul__": "tp$matmul",
     "__abs__": "nb$abs",
     "__neg__": "nb$negative",
     "__pos__": "nb$positive",