add + and * tck snippets with custom verifiers

Author: timfel

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

@@ -223,9 +223,8 @@ public Collection<? extends Snippet> createExpressions(Context context) {
         List<Snippet> snippets = new ArrayList<>();
 
         // @formatter:off
-        addExpressionSnippet(context, snippets, "+", "lambda x, y: x + y", NUMBER, union(BOOLEAN, NUMBER), union(BOOLEAN, NUMBER));
-        addExpressionSnippet(context, snippets, "+ str", "lambda x, y: x + y", NUMBER, union(BOOLEAN, NUMBER), union(BOOLEAN, NUMBER));
-        addExpressionSnippet(context, snippets, "+ list", "lambda x, y: x + y", array(ANY), PNoListCoercionVerifier.INSTANCE, array(ANY), array(ANY));
+        addExpressionSnippet(context, snippets, "+", "lambda x, y: x + y", union(STRING, NUMBER, array(ANY)), AddVerifier.INSTANCE, union(STRING, BOOLEAN, NUMBER, array(ANY)), union(STRING, BOOLEAN, NUMBER, array(ANY)));
+        addExpressionSnippet(context, snippets, "*", "lambda x, y: x * y", union(STRING, NUMBER, array(ANY)), MulVerifier.INSTANCE, union(STRING, BOOLEAN, NUMBER, array(ANY)), union(STRING, BOOLEAN, NUMBER, array(ANY)));
 
         addExpressionSnippet(context, snippets, "-", "lambda x, y: x - y", NUMBER, union(BOOLEAN, NUMBER), union(BOOLEAN, NUMBER));
 
@@ -350,7 +349,7 @@ private abstract static class PResultVerifier implements ResultVerifier {
     /**
      * Only accepts exact matches of types.
      */
-    private static class PNoListCoercionVerifier extends PResultVerifier {
+    private static class AddVerifier extends PResultVerifier {
 
         public void accept(SnippetRun snippetRun) throws PolyglotException {
             List<? extends Value> parameters = snippetRun.getParameters();
@@ -363,14 +362,81 @@ public void accept(SnippetRun snippetRun) throws PolyglotException {
             // ignore '(1,2) + [3,4]'.
             if (par0.hasArrayElements() && par1.hasArrayElements()) {
                 if (par0.getMetaObject() == par1.getMetaObject()) {
-                    ResultVerifier.getDefaultResultVerifier().accept(snippetRun);
+                    assert snippetRun.getException() == null;
+                    TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                    assert array(ANY).isAssignable(resultType);
                 }
+            } else if (par0.isString() && par1.isString()) {
+                assert snippetRun.getException() == null;
+                TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                assert STRING.isAssignable(resultType);
+            } else if ((par0.isNumber() || par0.isBoolean()) && (par1.isNumber() || par1.isBoolean())) {
+                assert snippetRun.getException() == null;
+                TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                assert NUMBER.isAssignable(resultType);
             } else {
-                ResultVerifier.getDefaultResultVerifier().accept(snippetRun);
+                assert snippetRun.getException() != null;
+                TypeDescriptor argType = union(STRING, BOOLEAN, NUMBER, array(ANY));
+                TypeDescriptor par0Type = TypeDescriptor.forValue(par0);
+                TypeDescriptor par1Type = TypeDescriptor.forValue(par1);
+                if (!argType.isAssignable(par0Type) || !argType.isAssignable(par1Type)) {
+                    // argument type error, rethrow
+                    throw snippetRun.getException();
+                } else {
+                    // arguments are ok, just don't work in this combination
+                }
+            }
+        }
+
+        private static final AddVerifier INSTANCE = new AddVerifier();
+    }
+
+    private static class MulVerifier extends PResultVerifier {
+
+        private static boolean isStringMul(Value x, Value y) {
+            return x.isString() && (y.isBoolean() || (y.isNumber() && y.fitsInInt()));
+        }
+
+        private static boolean isArrayMul(Value x, Value y) {
+            return x.hasArrayElements() && (y.isBoolean() || (y.isNumber() && (y.fitsInInt() || (y.fitsInLong() && y.asLong() < 0))));
+        }
+
+        public void accept(SnippetRun snippetRun) throws PolyglotException {
+            List<? extends Value> parameters = snippetRun.getParameters();
+            assert parameters.size() == 2;
+
+            Value par0 = parameters.get(0);
+            Value par1 = parameters.get(1);
+
+            if (isStringMul(par0, par1) || isStringMul(par1, par0)) {
+                // string * number => string
+                assert snippetRun.getException() == null;
+                TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                assert STRING.isAssignable(resultType);
+            } else if (isArrayMul(par0, par1) || isArrayMul(par1, par0)) {
+                // array * number => array
+                assert snippetRun.getException() == null;
+                TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                assert array(ANY).isAssignable(resultType);
+            } else if ((par0.isNumber() || par0.isBoolean()) && (par1.isNumber() || par1.isBoolean())) {
+                assert snippetRun.getException() == null;
+                TypeDescriptor resultType = TypeDescriptor.forValue(snippetRun.getResult());
+                assert NUMBER.isAssignable(resultType);
+            } else {
+                assert snippetRun.getException() != null;
+                TypeDescriptor argType = union(STRING, BOOLEAN, NUMBER, array(ANY));
+                TypeDescriptor par0Type = TypeDescriptor.forValue(par0);
+                TypeDescriptor par1Type = TypeDescriptor.forValue(par1);
+                if (!argType.isAssignable(par0Type) || !argType.isAssignable(par1Type)) {
+                    // argument type error, rethrow
+                    throw snippetRun.getException();
+                } else {
+                    // arguments are ok, just don't work in this combination
+                }
             }
         }
 
-        private static final PNoListCoercionVerifier INSTANCE = new PNoListCoercionVerifier();
+        private static final MulVerifier INSTANCE = new MulVerifier();
     }
 
     /**