Fix semantics of foreign mult: scalar vectors are treated as numbers.

Author: fangerer

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -360,11 +360,15 @@ public void accept(SnippetRun snippetRun) throws PolyglotException {
                 } else {
                     throw snippetRun.getException();
                 }
-            } else {
+            } else if (!(isNumber(par0) && isScalarVector(par1) || isScalarVector(par0) && isNumber(par1))) {
                 ResultVerifier.getDefaultResultVerifier().accept(snippetRun);
             }
         }
 
+        protected static boolean isScalarVector(Value val) {
+            return isNumber(val) && val.hasArrayElements() && val.getArraySize() == 1 && !isMapping(val);
+        }
+
         protected static boolean isNumber(Value par0) {
             return par0.isNumber() || par0.isBoolean();
         }
@@ -374,7 +378,7 @@ protected static boolean isNegativeNumber(Value par0) {
         }
 
         protected static boolean isSequence(Value par0) {
-            return par0.isString() || (par0.hasArrayElements() && !isMapping(par0));
+            return !isNumber(par0) && (par0.isString() || (par0.hasArrayElements() && !isMapping(par0)));
         }
 
         protected static boolean isMapping(Value par0) {
@@ -390,7 +394,7 @@ private static boolean hasMemoryError(SnippetRun snippetRun) {
         }
 
         private static boolean isInteger(Value par0) {
-            return (par0.isNumber() && par0.fitsInInt() || par0.isBoolean()) && !isSequence(par0);
+            return (par0.isNumber() && par0.fitsInInt() || par0.isBoolean());
         }
 
         private static final PSequenceMultiplicationVerifier INSTANCE = new PSequenceMultiplicationVerifier();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/foreign/TruffleObjectBuiltins.java

@@ -270,7 +270,7 @@ abstract static class MulNode extends UnboxNode {
 
         public abstract Object executeWith(Object left, Object right);
 
-        @Specialization(guards = {"isBoxed(left)", "!isForeignArray(left)", "!isForeignObject(right)"})
+        @Specialization(guards = {"isBoxed(left)", "!isForeignObject(right)"})
         Object doForeignBoxed(TruffleObject left, Object right) {
             try {
                 return mulNode.executeObject(unboxLeft(left), right);
@@ -279,7 +279,7 @@ Object doForeignBoxed(TruffleObject left, Object right) {
             }
         }
 
-        @Specialization(guards = {"isBoxed(left)", "!isForeignArray(left)", "isBoxed(right)", "!isForeignArray(right)"})
+        @Specialization(guards = {"isBoxed(left)", "isBoxed(right)"})
         Object doForeignBoxed(TruffleObject left, TruffleObject right) {
             try {
                 return getRecursiveNode().executeWith(left, unboxRight(right));
@@ -289,7 +289,7 @@ Object doForeignBoxed(TruffleObject left, TruffleObject right) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
-        @Specialization(guards = {"isForeignArray(left)", "isPositive(right)"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "right > 0"})
         Object doForeignArray(TruffleObject left, int right,
                         @Cached("READ.createNode()") Node readNode,
                         @Cached("GET_SIZE.createNode()") Node sizeNode) {
@@ -312,7 +312,7 @@ Object doForeignArray(TruffleObject left, int right,
             }
         }
 
-        @Specialization(guards = {"isForeignArray(left)", "isBoxed(right)", "!isForeignArray(right)"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "isBoxed(right)"})
         Object doForeignArray(TruffleObject left, TruffleObject right,
                         @Cached("READ.createNode()") Node readNode,
                         @Cached("GET_SIZE.createNode()") Node sizeNode) {
@@ -331,7 +331,7 @@ Object doForeignArray(TruffleObject left, TruffleObject right,
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
-        @Specialization(guards = {"isForeignArray(left)", "right"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "right"})
         Object doForeignArray(TruffleObject left, @SuppressWarnings("unused") boolean right,
                         @Cached("READ.createNode()") Node readNode,
                         @Cached("GET_SIZE.createNode()") Node sizeNode) {
@@ -343,19 +343,19 @@ Object doForeignArray(TruffleObject left, @SuppressWarnings("unused") boolean ri
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"isForeignArray(left)", "!right"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "!right"})
         Object doForeignArrayEmpty(TruffleObject left, boolean right) {
             return factory().createList();
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"isForeignArray(left)", "right <= 0"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "right <= 0"})
         Object doForeignArrayEmpty(TruffleObject left, int right) {
             return factory().createList();
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"isForeignArray(left)", "right <= 0"})
+        @Specialization(guards = {"isForeignArray(left)", "!isBoxed(left)", "right <= 0"})
         Object doForeignArrayEmpty(TruffleObject left, long right) {
             return factory().createList();
         }
@@ -366,10 +366,6 @@ PNotImplemented doGeneric(Object left, Object right) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
 
-        protected boolean isPositive(int right) {
-            return right > 0;
-        }
-
         private MulNode getRecursiveNode() {
             if (recursive == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -592,10 +588,6 @@ Object doForeignBoxed(TruffleObject left, TruffleObject right) {
         PNotImplemented doGeneric(Object left, Object right) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
-
-        protected boolean isPositive(int right) {
-            return right > 0;
-        }
     }
 
     @Builtin(name = __RTRUEDIV__, fixedNumOfArguments = 2)