diff --git a/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNodeTest.java b/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNodeTest.java
index 46106945e5a2de13a94cbd614dd7ca9d589d014e..3bef120c010877eed646727e11b60c026da421e9 100644
--- a/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNodeTest.java
+++ b/com.oracle.truffle.r.nodes.test/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNodeTest.java
@@ -246,15 +246,18 @@ public class ExtractVectorNodeTest extends TestBase {
@Theory
public void testCompletenessAfterExtraction(RType targetType) {
- RAbstractVector vector = generateVector(targetType, 4, false);
+ execInContext(() -> {
+ RAbstractVector vector = generateVector(targetType, 4, false);
- assumeTrue(targetType != RType.List);
- assumeThat(vector.isComplete(), is(false));
- // extract some non NA elements
- int[] positions = targetType == RType.Complex ? new int[]{1, 3} : new int[]{1, 2};
- RAbstractVector result = executeExtract(ElementAccessMode.SUBSET, vector, RDataFactory.createIntVector(positions, true));
+ assumeTrue(targetType != RType.List);
+ assumeThat(vector.isComplete(), is(false));
+ // extract some non NA elements
+ int[] positions = targetType == RType.Complex ? new int[]{1, 3} : new int[]{1, 2};
+ RAbstractVector result = executeExtract(ElementAccessMode.SUBSET, vector, RDataFactory.createIntVector(positions, true));
- assertThat(result.isComplete(), is(true));
+ assertThat(result.isComplete(), is(true));
+ return null;
+ });
}
@Theory
diff --git a/com.oracle.truffle.r.test.tck/src/META-INF/services/org.graalvm.polyglot.tck.LanguageProvider b/com.oracle.truffle.r.test.tck/src/META-INF/services/org.graalvm.polyglot.tck.LanguageProvider
new file mode 100644
index 0000000000000000000000000000000000000000..edb1e18485037b8de4bfee3b0bb0e6c3ad6a3ebf
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/META-INF/services/org.graalvm.polyglot.tck.LanguageProvider
@@ -0,0 +1 @@
+com.oracle.truffle.r.test.tck.RTCKLanguageProvider
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/RTCKLanguageProvider.java b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/RTCKLanguageProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..c410a607c8e5616faa23cc4206ecf2b9b05c60e5
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/RTCKLanguageProvider.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.test.tck;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiFunction;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.tck.Snippet;
+import org.graalvm.polyglot.tck.TypeDescriptor;
+import org.junit.Assert;
+import org.graalvm.polyglot.tck.LanguageProvider;
+import org.graalvm.polyglot.tck.ResultVerifier;
+
+public final class RTCKLanguageProvider implements LanguageProvider {
+
+ private static final String ID = "R";
+ private static final String PATTERN_VALUE_FNC = "function () {\n" +
+ "%s\n" +
+ "}";
+ private static final String PATTERN_BIN_OP_FNC = "function(a,b) {\n" +
+ "a %s b\n" +
+ "}";
+ private static final String PATTERN_PREFIX_OP_FNC = "function(a) {\n" +
+ "%s a\n" +
+ "}";
+ private static final String[] PATTERN_STATEMENT = {
+ "function() {\n" +
+ "r <- NULL\n" +
+ "%s\n" +
+ "r\n" +
+ "}",
+ "function(p1) {\n" +
+ "r <- NULL\n" +
+ "%s\n" +
+ "r\n" +
+ "}",
+ "function(p1, p2) {\n" +
+ "r <- NULL\n" +
+ "%s\n" +
+ "r\n" +
+ "}"
+ };
+
+ public RTCKLanguageProvider() {
+ }
+
+ @Override
+ public String getId() {
+ return ID;
+ }
+
+ @Override
+ public Value createIdentityFunction(Context context) {
+ return eval(context, "function(a) {\n" +
+ "a\n" +
+ "}\n");
+ }
+
+ @Override
+ public Collection<? extends Snippet> createValueConstructors(Context context) {
+ List<Snippet> vals = new ArrayList<>();
+
+ // Scalar types
+ vals.add(createValueConstructor(context, "1L", TypeDescriptor.NUMBER));
+ vals.add(createValueConstructor(context, "1.42", TypeDescriptor.NUMBER));
+ vals.add(createValueConstructor(context, "FALSE", TypeDescriptor.BOOLEAN));
+ vals.add(createValueConstructor(context, "'TEST'", TypeDescriptor.STRING));
+ vals.add(createValueConstructor(context, "1+1i", TypeDescriptor.intersection())); // generic
+ // type
+
+ // TODO NULL, raw, s4, env, list, empty, ...
+ // vals.add(createValueConstructor(context, "NULL", TypeDescriptor.NULL));
+
+ // Vectors & Lists
+ Snippet v = createValueConstructor(context, "c(1L:10L)", TypeDescriptor.array(TypeDescriptor.NUMBER));
+ vals.add(v);
+
+ v = createValueConstructor(context, "c(1:10)", TypeDescriptor.array(TypeDescriptor.NUMBER));
+ vals.add(v);
+
+ vals.add(createValueConstructor(context, "c(TRUE, FALSE)", TypeDescriptor.array(TypeDescriptor.BOOLEAN)));
+ vals.add(createValueConstructor(context, "c(1L, 'STRING')", TypeDescriptor.array(TypeDescriptor.STRING)));
+ return Collections.unmodifiableList(vals);
+ }
+
+ @Override
+ public Collection<? extends Snippet> createExpressions(Context context) {
+ List<Snippet> ops = new ArrayList<>();
+ TypeDescriptor numOrBool = TypeDescriptor.union(TypeDescriptor.NUMBER, TypeDescriptor.BOOLEAN);
+ TypeDescriptor numOrBoolOrNull = TypeDescriptor.union(numOrBool, TypeDescriptor.NULL);
+ TypeDescriptor arrNumBool = TypeDescriptor.array(numOrBool);
+ TypeDescriptor numOrBoolOrArrNumBool = TypeDescriptor.union(numOrBool, arrNumBool);
+ TypeDescriptor numOrBoolOrNullOrArrNumBool = TypeDescriptor.union(numOrBoolOrNull, arrNumBool);
+ TypeDescriptor boolOrArrBool = TypeDescriptor.union(TypeDescriptor.BOOLEAN, TypeDescriptor.array(TypeDescriptor.BOOLEAN));
+ TypeDescriptor strOrNumOrBool = TypeDescriptor.union(TypeDescriptor.STRING, numOrBool);
+ TypeDescriptor arrStrNumBool = TypeDescriptor.array(strOrNumOrBool);
+ TypeDescriptor strOrNumOrBoolOrArrStrNumBool = TypeDescriptor.union(strOrNumOrBool, arrStrNumBool);
+
+ // +
+ ops.add(createBinaryOperator(context, "+", numOrBoolOrArrNumBool, numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool,
+ RResultVerifier.newBuilder(numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool).emptyArrayCheck().build()));
+ // -
+ ops.add(createBinaryOperator(context, "-", numOrBoolOrArrNumBool, numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool,
+ RResultVerifier.newBuilder(numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool).emptyArrayCheck().build()));
+ // *
+ ops.add(createBinaryOperator(context, "*", numOrBoolOrArrNumBool, numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool,
+ RResultVerifier.newBuilder(numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool).emptyArrayCheck().build()));
+ // /
+ ops.add(createBinaryOperator(context, "/", numOrBoolOrArrNumBool, numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool,
+ RResultVerifier.newBuilder(numOrBoolOrNullOrArrNumBool, numOrBoolOrNullOrArrNumBool).emptyArrayCheck().build()));
+
+ // <
+ ops.add(createBinaryOperator(context, "<", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // >
+ ops.add(createBinaryOperator(context, ">", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // <=
+ ops.add(createBinaryOperator(context, "<=", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // >=
+ ops.add(createBinaryOperator(context, ">=", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // ==
+ ops.add(createBinaryOperator(context, "==", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // !=
+ ops.add(createBinaryOperator(context, "!=", boolOrArrBool, strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool,
+ RResultVerifier.newBuilder(strOrNumOrBoolOrArrStrNumBool, strOrNumOrBoolOrArrStrNumBool).mixedArraysCheck().emptyArrayCheck().build()));
+ // // TODO &, |, &&, ||
+
+ // !
+ ops.add(createPrefixOperator(context, "!", boolOrArrBool, numOrBoolOrArrNumBool, null));
+
+ // TODO unary +, -, ...
+
+ return Collections.unmodifiableList(ops);
+ }
+
+ @Override
+ public Collection<? extends Snippet> createStatements(Context context) {
+ Collection<Snippet> res = new ArrayList<>();
+ TypeDescriptor numberOrBoolean = TypeDescriptor.union(TypeDescriptor.NUMBER, TypeDescriptor.BOOLEAN);
+ TypeDescriptor arrayNumberBoolean = TypeDescriptor.array(numberOrBoolean);
+ TypeDescriptor numberOrBooleanOrArrayNumberBoolean = TypeDescriptor.union(numberOrBoolean, arrayNumberBoolean);
+
+ // if
+ String ifStatement = "if ({1}) '{'\n{0}<-TRUE\n'}' else '{'\n{0}<-FALSE\n'}'";
+ res.add(createStatement(context, "if", ifStatement,
+ RResultVerifier.newBuilder(numberOrBooleanOrArrayNumberBoolean).emptyArrayCheck().build(),
+ TypeDescriptor.BOOLEAN, numberOrBooleanOrArrayNumberBoolean));
+
+ // ifelse
+ String ifelseStatement = "ifelse ({1}, TRUE, FALSE)";
+ res.add(createStatement(context, "ifelse", ifelseStatement, TypeDescriptor.NULL,
+ TypeDescriptor.union(
+ TypeDescriptor.BOOLEAN,
+ TypeDescriptor.NUMBER,
+ TypeDescriptor.STRING,
+ TypeDescriptor.ARRAY)));
+
+ // while
+ String whileStatement = "while ({1})'{'\nbreak\n'}'";
+ res.add(createStatement(context, "while", whileStatement,
+ RResultVerifier.newBuilder(numberOrBooleanOrArrayNumberBoolean).emptyArrayCheck().build(),
+ TypeDescriptor.NULL, numberOrBooleanOrArrayNumberBoolean));
+
+ // for
+ String forStatement = "for (val in {1}) '{'\n'}'";
+ res.add(createStatement(context, "for", forStatement, TypeDescriptor.NULL, TypeDescriptor.ANY));
+
+ return Collections.unmodifiableCollection(res);
+ }
+
+ @Override
+ public Collection<? extends Snippet> createScripts(Context context) {
+ List<Snippet> res = new ArrayList<>();
+ res.add(loadScript(
+ context,
+ "resources/quicksort.R",
+ TypeDescriptor.BOOLEAN,
+ (snippetRun) -> {
+ Assert.assertEquals(true, snippetRun.getResult().asBoolean());
+ }));
+ res.add(loadScript(
+ context,
+ "resources/mandel.R",
+ TypeDescriptor.NUMBER,
+ (snippetRun) -> {
+ Assert.assertEquals(14791, snippetRun.getResult().asInt());
+ }));
+ res.add(loadScript(
+ context,
+ "resources/rand_mat_mul.R",
+ TypeDescriptor.BOOLEAN,
+ (snippetRun) -> {
+ Assert.assertEquals(true, snippetRun.getResult().asBoolean());
+ }));
+ res.add(loadScript(
+ context,
+ "resources/rand_mat_stat.R",
+ TypeDescriptor.BOOLEAN,
+ (snippetRun) -> {
+ Assert.assertEquals(true, snippetRun.getResult().asBoolean());
+ }));
+ res.add(loadScript(
+ context,
+ "resources/pi_sum.R",
+ TypeDescriptor.BOOLEAN,
+ (snippetRun) -> {
+ Assert.assertEquals(true, snippetRun.getResult().asBoolean());
+ }));
+ res.add(loadScript(
+ context,
+ "resources/fib.R",
+ TypeDescriptor.NUMBER,
+ (snippetRun) -> {
+ Assert.assertEquals(6765, snippetRun.getResult().asInt());
+ }));
+ return Collections.unmodifiableList(res);
+ }
+
+ @Override
+ public Collection<? extends Source> createInvalidSyntaxScripts(Context context) {
+ try {
+ List<Source> res = new ArrayList<>();
+ res.add(createSource("resources/invalidSyntax01.R"));
+ return Collections.unmodifiableList(res);
+ } catch (IOException ioe) {
+ throw new AssertionError("IOException while creating a test script.", ioe);
+ }
+ }
+
+ private Snippet createValueConstructor(
+ Context context,
+ String value,
+ TypeDescriptor type) {
+ return Snippet.newBuilder(value, eval(context, String.format(PATTERN_VALUE_FNC, value)), type).build();
+ }
+
+ private Snippet createBinaryOperator(
+ Context context,
+ String operator,
+ TypeDescriptor type,
+ TypeDescriptor ltype,
+ TypeDescriptor rtype,
+ ResultVerifier verifier) {
+ Value fnc = eval(context, String.format(PATTERN_BIN_OP_FNC, operator));
+ Snippet.Builder opb = Snippet.newBuilder(operator, fnc, type).parameterTypes(ltype, rtype).resultVerifier(verifier);
+ return opb.build();
+ }
+
+ private Snippet createPrefixOperator(
+ Context context,
+ String operator,
+ TypeDescriptor type,
+ TypeDescriptor rtype,
+ ResultVerifier verifier) {
+ Value fnc = eval(context, String.format(PATTERN_PREFIX_OP_FNC, operator));
+ Snippet.Builder opb = Snippet.newBuilder(operator, fnc, type).parameterTypes(rtype).resultVerifier(verifier);
+ return opb.build();
+ }
+
+ private Snippet createStatement(
+ Context context,
+ String name,
+ String expression,
+ TypeDescriptor type,
+ TypeDescriptor... paramTypes) {
+ return createStatement(context, name, expression, null, type, paramTypes);
+ }
+
+ private Snippet createStatement(
+ Context context,
+ String name,
+ String expression,
+ ResultVerifier verifier,
+ TypeDescriptor type,
+ TypeDescriptor... paramTypes) {
+ String fncFormat = PATTERN_STATEMENT[paramTypes.length];
+ Object[] formalParams = new String[paramTypes.length + 1];
+ formalParams[0] = "r";
+ for (int i = 1; i < formalParams.length; i++) {
+ formalParams[i] = "p" + i;
+ }
+ String exprWithFormalParams = MessageFormat.format(expression, formalParams);
+ Value fnc = eval(context, String.format(fncFormat, exprWithFormalParams));
+ Snippet.Builder opb = Snippet.newBuilder(name, fnc, type).parameterTypes(paramTypes).resultVerifier(verifier);
+ return opb.build();
+ }
+
+ private Snippet loadScript(
+ Context context,
+ String resourceName,
+ TypeDescriptor type,
+ ResultVerifier verifier) {
+ try {
+ Source src = createSource(resourceName);
+ return Snippet.newBuilder(src.getName(), context.eval(src), type).resultVerifier(verifier).build();
+ } catch (IOException ioe) {
+ throw new AssertionError("IOException while creating a test script.", ioe);
+ }
+ }
+
+ private static Source createSource(String resourceName) throws IOException {
+ int slashIndex = resourceName.lastIndexOf('/');
+ String scriptName = slashIndex >= 0 ? resourceName.substring(slashIndex + 1) : resourceName;
+ Reader in = new InputStreamReader(RTCKLanguageProvider.class.getResourceAsStream(resourceName), "UTF-8");
+ return Source.newBuilder(ID, in, scriptName).build();
+ }
+
+ private Value eval(Context context, String statement) {
+ return context.eval(ID, statement);
+ }
+
+ private static final class RResultVerifier implements ResultVerifier {
+ private TypeDescriptor[] expectedParameterTypes;
+ BiFunction<Boolean, SnippetRun, Void> next;
+
+ private RResultVerifier(
+ TypeDescriptor[] expectedParameterTypes,
+ BiFunction<Boolean, SnippetRun, Void> next) {
+ this.expectedParameterTypes = Objects.requireNonNull(expectedParameterTypes, "The expectedParameterTypes cannot be null.");
+ this.next = Objects.requireNonNull(next, "The verifier chain cannot be null.");
+ }
+
+ @Override
+ public void accept(SnippetRun snippetRun) throws PolyglotException {
+ next.apply(hasValidArgumentTypes(snippetRun.getParameters()), snippetRun);
+ }
+
+ private boolean hasValidArgumentTypes(List<? extends Value> args) {
+ for (int i = 0; i < expectedParameterTypes.length; i++) {
+ if (!expectedParameterTypes[i].isAssignable(TypeDescriptor.forValue(args.get(i)))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ static Builder newBuilder(TypeDescriptor... expectedParameterTypes) {
+ return new Builder(expectedParameterTypes);
+ }
+
+ static final class Builder {
+ private final TypeDescriptor[] expectedParameterTypes;
+ private BiFunction<Boolean, SnippetRun, Void> chain;
+
+ private Builder(TypeDescriptor[] expectedParameterTypes) {
+ this.expectedParameterTypes = expectedParameterTypes;
+ chain = (valid, snippetRun) -> {
+ ResultVerifier.getDefaultResultVerfier().accept(snippetRun);
+ return null;
+ };
+ }
+
+ /**
+ * Enables result verifier to handle empty arrays. Use this for R expressions,
+ * statements which accept array but not an empty array
+ *
+ * @return the Builder
+ */
+ Builder emptyArrayCheck() {
+ chain = new BiFunction<Boolean, SnippetRun, Void>() {
+ private final BiFunction<Boolean, SnippetRun, Void> next = chain;
+
+ @Override
+ public Void apply(Boolean valid, SnippetRun sr) {
+ if (valid && sr.getException() != null && hasEmptyArrayArg(sr.getParameters())) {
+ return null;
+ }
+ return next.apply(valid, sr);
+ }
+
+ private boolean hasEmptyArrayArg(List<? extends Value> args) {
+ for (Value arg : args) {
+ if (arg.hasArrayElements() && arg.getArraySize() == 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+ return this;
+ }
+
+ // Todo: Is it R bug or should verifier handle this?
+ // [1,"TEST"] < [1,2] works
+ // [1,"TEST"] < [1,"TEST"] fails
+ Builder mixedArraysCheck() {
+ chain = new BiFunction<Boolean, SnippetRun, Void>() {
+ private final BiFunction<Boolean, SnippetRun, Void> next = chain;
+
+ @Override
+ public Void apply(Boolean valid, SnippetRun sr) {
+ if (valid && sr.getException() != null && areMixedArrays(sr.getParameters())) {
+ return null;
+ }
+ return next.apply(valid, sr);
+ }
+
+ private boolean areMixedArrays(List<? extends Value> args) {
+ for (Value arg : args) {
+ if (!arg.hasArrayElements()) {
+ return false;
+ }
+ boolean str = false;
+ boolean num = false;
+ for (int i = 0; i < arg.getArraySize(); i++) {
+ TypeDescriptor td = TypeDescriptor.forValue(arg.getArrayElement(i));
+ str |= TypeDescriptor.STRING.isAssignable(td);
+ num |= TypeDescriptor.NUMBER.isAssignable(td) || TypeDescriptor.BOOLEAN.isAssignable(td);
+ }
+ if ((!str & !num) || (str ^ num)) {
+ return false;
+ }
+ }
+ return !args.isEmpty();
+ }
+ };
+ return this;
+ }
+
+ RResultVerifier build() {
+ return new RResultVerifier(expectedParameterTypes, chain);
+ }
+ }
+ }
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/fib.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/fib.R
new file mode 100644
index 0000000000000000000000000000000000000000..335230984b3fb7ea0ea25781cc2135d1462aac3b
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/fib.R
@@ -0,0 +1,11 @@
+fib_fun <- function(n) {
+ if (n < 2) {
+ return(n)
+ } else {
+ return(fib_fun(n - 1) + fib_fun(n - 2))
+ }
+}
+
+function() {
+ return (fib_fun(20))
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/invalidSyntax01.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/invalidSyntax01.R
new file mode 100644
index 0000000000000000000000000000000000000000..7f59f7b1b36d50740d8ebc660c8c7357729c7030
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/invalidSyntax01.R
@@ -0,0 +1,2 @@
+function() {
+ TRUE
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/mandel.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/mandel.R
new file mode 100644
index 0000000000000000000000000000000000000000..3790e49103bb8f72578a8234644448b3c8e4ff21
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/mandel.R
@@ -0,0 +1,27 @@
+mandel_fun = function(z) {
+ c = z
+ maxiter = 80
+ for (n in 1:maxiter) {
+ if (Mod(z) > 2) return(n-1)
+ z = z^2+c
+ }
+ return(maxiter)
+}
+
+Mandel = function(x) {
+ re = seq(-2,0.5,.1)
+ im = seq(-1,1,.1)
+ M = matrix(0.0,nrow=length(re),ncol=length(im))
+ count = 1
+ for (r in re) {
+ for (i in im) {
+ M[count] = mandel_fun(complex(real=r,imag=i))
+ count = count + 1
+ }
+ }
+ return(sum(M))
+}
+
+function() {
+ return (Mandel(c()))
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/pi_sum.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/pi_sum.R
new file mode 100644
index 0000000000000000000000000000000000000000..fc4965ee811b0542cd0fc5898606388429cd44db
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/pi_sum.R
@@ -0,0 +1,14 @@
+PiSum <- function(x) {
+ t = 0.0
+ for (j in 1:500) {
+ t = 0.0
+ for (k in 1:10000) {
+ t = t + 1.0/(k*k)
+ }
+ }
+ return(abs(t-1.644834071848065) < 1e-12)
+}
+
+function() {
+ return(PiSum(c()));
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/quicksort.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/quicksort.R
new file mode 100644
index 0000000000000000000000000000000000000000..d7da103d2908dffd0a6f2edb043456f78c19fd4f
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/quicksort.R
@@ -0,0 +1,35 @@
+qsort = function(a) {
+ qsort_kernel = function(lo, hi) {
+ i = lo
+ j = hi
+ while (i < hi) {
+ pivot = a[floor((lo+hi)/2)]
+ while (i <= j) {
+ while (a[i] < pivot) i = i + 1
+ while (a[j] > pivot) j = j - 1
+ if (i <= j) {
+ t = a[i]
+ a[i] <<- a[j]
+ a[j] <<- t
+ i = i + 1;
+ j = j - 1;
+ }
+ }
+ if (lo < j) qsort_kernel(lo, j)
+ lo = i
+ j = hi
+ }
+ }
+ qsort_kernel(1, length(a))
+ return(a)
+}
+
+Quicksort = function(n) {
+ v = runif(n)
+ result = qsort(v)
+ return (!is.unsorted(result))
+}
+
+function () {
+ Quicksort(1000);
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_mul.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_mul.R
new file mode 100644
index 0000000000000000000000000000000000000000..fa6833e66559e32f664c7bc69f0c26feed9619d6
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_mul.R
@@ -0,0 +1,10 @@
+RandMatMul <- function(n) {
+ A <- matrix(runif(n*n), ncol=n, nrow=n)
+ B <- matrix(runif(n*n), ncol=n, nrow=n)
+ result <- A %*% B
+ return (all(result >= 0))
+}
+
+function() {
+ return (RandMatMul(100))
+}
diff --git a/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_stat.R b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_stat.R
new file mode 100644
index 0000000000000000000000000000000000000000..13956545a14e1eb18a676ff775b3c16f5b342c2d
--- /dev/null
+++ b/com.oracle.truffle.r.test.tck/src/com/oracle/truffle/r/test/tck/resources/rand_mat_stat.R
@@ -0,0 +1,23 @@
+RandMatStat = function(t) {
+ set.seed(10)
+ n = 5
+ v = matrix(0, nrow=t)
+ w = matrix(0, nrow=t)
+ for (i in 1:t) {
+ a = matrix(rnorm(n*n), ncol=n, nrow=n)
+ b = matrix(rnorm(n*n), ncol=n, nrow=n)
+ c = matrix(rnorm(n*n), ncol=n, nrow=n)
+ d = matrix(rnorm(n*n), ncol=n, nrow=n)
+ P = cbind(a,b,c,d)
+ Q = rbind(cbind(a,b),cbind(c,d))
+ v[i] = sum(diag((t(P)%*%P)^4))
+ w[i] = sum(diag((t(Q)%*%Q)^4))
+ }
+ s1 = apply(v,2,sd)/mean(v)
+ s2 = apply(w,2,sd)/mean(w)
+ return (round(s1, digits=7) == 0.8324299 && round(s2, digits=7) == 0.7440433)
+}
+
+function() {
+ return (RandMatStat(1000))
+}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java
deleted file mode 100644
index 6a0e7a31fcab769a25c4ebc48c3d8d5a0348bfb8..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.r.test.tck;
-
-public class FastRTckTest /* extends TruffleTCK */ {
-
- // disabled
-
- // @Test
- // public void testVerifyPresence() {
- // PolyglotEngine vm = PolyglotEngine.newBuilder().build();
- // assertTrue("Our language is present", vm.getLanguages().containsKey("text/x-r"));
- // }
- //
-// // @formatter:off
-// private static final String INITIALIZATION_CODE =
-// "fourtyTwo <- function() {\n" +
-// " 42L\n" +
-// "}\n" +
-// "plus <- function(a, b) {\n" +
-// " a + b\n" +
-// "}\n" +
-// "identity <- function(a) {\n" +
-// " a\n" +
-// "}\n" +
-// "apply <- function(f) {\n" +
-// " f(18L, 32L) + 10L\n" +
-// "}\n" +
-// "null <- function() {\n" +
-// " NULL\n" +
-// "}\n" +
-// "counter <- 0L\n" +
-// "count <- function() {\n" +
-// " counter <<- counter + 1L\n" +
-// "}\n" +
-// "complexAdd <- function(a, b) {\n" +
-// " a$imaginary <- a$imaginary + b$imaginary\n" +
-// " a$real <- a$real + b$real\n" +
-// "}\n" +
-// "countUpWhile <- function(fn) {\n" +
-// " counter <- 0\n" +
-// " while (T) {\n" +
-// " if (!fn(counter)) {\n" +
-// " break\n" +
-// " }\n" +
-// " counter <- counter + 1\n" +
-// " }\n" +
-// "}\n" +
-// "complexSumReal <- function(a) {\n" +
-// " sum <- 0\n" +
-// " for (i in 1:length(a)) {\n" +
-// " sum <- sum + a[i]$real\n" +
-// " }\n" +
-// " return(sum)\n" +
-// "}\n" +
-// "complexCopy <- function(a, b) {\n" +
-// " for (i in 0:(length(b)-1)) {\n" +
-// " a[i]$real <- b[i]$real\n" +
-// " a[i]$imaginary <- b[i]$imaginary\n" +
-// " }\n" +
-// "}\n" +
-// "valuesObject <- function() {\n" +
-// " list('byteValue'=0L, 'shortValue'=0L, 'intValue'=0L, 'longValue'=0L, 'floatValue'=0, 'doubleValue'=0, 'charValue'=48L, 'stringValue'='', 'booleanValue'=FALSE)\n" +
-// "}\n" +
-// "addNumbersFunction <- function() {\n" +
-// " function(a, b) a + b\n" +
-// "}\n" +
-// "objectWithValueProperty <- function() {\n" +
-// " list(value = 42L)\n" +
-// "}\n" +
-// "callFunction <- function(f) {\n" +
-// " f(41L, 42L)\n" +
-// "}\n" +
-// "objectWithElement <- function(f) {\n" +
-// " c(0L, 0L, 42L, 0L)\n" +
-// "}\n" +
-// "objectWithValueAndAddProperty <- function(f) {\n" +
-// " e <- new.env()\n" +
-// " e$value <- 0L\n" +
-// " e$add <- function(inc) { e$value <- e$value + inc; e$value }\n" +
-// " e\n" +
-// "}\n" +
-// "callMethod <- function(f) {\n" +
-// " f(41L, 42L)\n" +
-// "}\n" +
-// "readElementFromForeign <- function(f) {\n" +
-// " f[[3L]]\n" +
-// "}\n" +
-// "writeElementToForeign <- function(f) {\n" +
-// " f[[3L]] <- 42L\n" +
-// "}\n" +
-// "readValueFromForeign <- function(o) {\n" +
-// " o$value\n" +
-// "}\n" +
-// "writeValueToForeign <- function(o) {\n" +
-// " o$value <- 42L\n" +
-// "}\n" +
-// "getSizeOfForeign <- function(o) {\n" +
-// " length(o)\n" +
-// "}\n" +
-// "isNullOfForeign <- function(o) {\n" +
-// " .fastr.interop.toBoolean(is.external.null(o))\n" +
-// "}\n" +
-// "hasSizeOfForeign <- function(o) {\n" +
-// " .fastr.interop.toBoolean(is.external.array(o))\n" +
-// "}\n" +
-// "isExecutableOfForeign <- function(o) {\n" +
-// " .fastr.interop.toBoolean(is.external.executable(o))\n" +
-// "}\n" +
-// "intValue <- function() 42L\n" +
-// "intVectorValue <- function() c(42L, 40L)\n" +
-// "intSequenceValue <- function() 42:50\n" +
-// "intType <- function() 'integer'\n" +
-// "doubleValue <- function() 42.1\n" +
-// "doubleVectorValue <- function() c(42.1, 40)\n" +
-// "doubleSequenceValue <- function() 42.1:50\n" +
-// "doubleType <- function() 'double'\n" +
-// "functionValue <- function() { function(x) 1 }\n" +
-// "functionType <- function() 'closure'\n" +
-// "builtinFunctionValue <- function() `+`\n" +
-// "builtinFunctionType <- function() 'builtin'\n" +
-// "valueWithSource <- function() intValue\n" +
-// "objectWithKeyInfoAttributes <- function() { list(rw=1, invocable=function(){ 'invoked' }) }\n" +
-// "for (name in ls()) export(name, get(name))\n";
-// // @formatter:on
- //
- // private static final Source INITIALIZATION =
- // Source.newBuilder(INITIALIZATION_CODE).name("TCK").mimeType(RRuntime.R_APP_MIME).build();
- //
- // @Override
- // protected PolyglotEngine prepareVM(Builder builder) throws Exception {
- // PolyglotEngine engine = builder.build();
- // engine.eval(INITIALIZATION).get();
- // return engine;
- // }
- //
- // @Override
- // protected String mimeType() {
- // return "text/x-r";
- // }
- //
- // @Override
- // protected String fourtyTwo() {
- // return "fourtyTwo";
- // }
- //
- // @Override
- // protected String plusInt() {
- // return "plus";
- // }
- //
- // @Override
- // protected String identity() {
- // return "identity";
- // }
- //
- // @Override
- // protected String returnsNull() {
- // return "null";
- // }
- //
- // @Override
- // protected String applyNumbers() {
- // return "apply";
- // }
- //
- // @Override
- // protected String countInvocations() {
- // return "count";
- // }
- //
- // @Override
- // protected String complexAdd() {
- // return "complexAdd";
- // }
- //
- // @Override
- // protected String complexSumReal() {
- // return "complexSumReal";
- // }
- //
- // @Override
- // protected String complexCopy() {
- // return "complexCopy";
- // }
- //
- // @Override
- // protected String invalidCode() {
- // return "main <- function() {\n";
- // }
- //
- // @Override
- // protected String valuesObject() {
- // return "valuesObject";
- // }
- //
- // @Override
- // protected String countUpWhile() {
- // return "countUpWhile";
- // }
- //
- // @Override
- // protected String addToArray() {
- // // TODO not yet supported
- // return null;
- // }
- //
- // @Override
- // protected String getSizeOfForeign() {
- // return "getSizeOfForeign";
- // }
- //
- // @Override
- // protected String isNullForeign() {
- // return "isNullOfForeign";
- // }
- //
- // @Override
- // protected String hasSizeOfForeign() {
- // return "hasSizeOfForeign";
- // }
- //
- // @Override
- // protected String isExecutableOfForeign() {
- // return "isExecutableOfForeign";
- // }
- //
- // @Override
- // protected String readValueFromForeign() {
- // return "readValueFromForeign";
- // }
- //
- // @Override
- // protected String writeValueToForeign() {
- // return "writeValueToForeign";
- // }
- //
- // @Override
- // protected String callFunction() {
- // return "callFunction";
- // }
- //
- // @Override
- // protected String objectWithElement() {
- // return "objectWithElement";
- // }
- //
- // @Override
- // protected String objectWithValueAndAddProperty() {
- // return "objectWithValueAndAddProperty";
- // }
- //
- // @Override
- // protected String callMethod() {
- // return "callMethod";
- // }
- //
- // @Override
- // protected String readElementFromForeign() {
- // return "readElementFromForeign";
- // }
- //
- // @Override
- // protected String writeElementToForeign() {
- // return "writeElementToForeign";
- // }
- //
- // @Override
- // protected String objectWithValueProperty() {
- // return "objectWithValueProperty";
- // }
- //
- // @Override
- // protected String functionAddNumbers() {
- // return "addNumbersFunction";
- // }
- //
- // @Override
- // public void readWriteBooleanValue() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // public void readWriteCharValue() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // public void readWriteShortValue() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // public void readWriteByteValue() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // public void readWriteFloatValue() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // public void testAddComplexNumbersWithMethod() throws Exception {
- // // TODO not yet supported
- // }
- //
- // @Override
- // @Test
- // public void testNull() {
- // // disabled because we don't provide a Java "null" value in R
- // }
- //
- // @Override
- // @Test
- // public void testNullInCompoundObject() {
- // // disabled because we don't provide a Java "null" value in R
- // }
- //
- // @Override
- // @Test
- // public void testPlusWithIntsOnCompoundObject() throws Exception {
- // // TODO support this test case.
- // }
- //
- // @Override
- // @Test
- // public void testMaxOrMinValue() throws Exception {
- // // TODO support this test case.
- // }
- //
- // @Override
- // @Test
- // public void testMaxOrMinValue2() throws Exception {
- // // TODO support this test case.
- // }
- //
- // @Override
- // @Test
- // public void testFortyTwoWithCompoundObject() throws Exception {
- // // TODO support this test case.
- // }
- //
- // @Override
- // public void testPlusWithFloat() throws Exception {
- // // no floats in FastR
- // }
- //
- // @Override
- // public void testPrimitiveReturnTypeFloat() throws Exception {
- // // no floats in FastR
- // }
- //
- // @Override
- // public void testPlusWithOneNegativeShort() throws Exception {
- // // no floats in FastR
- // }
- //
- // @Override
- // public void testPlusWithDoubleFloatSameAsInt() throws Exception {
- // // no floats in FastR
- // }
- //
- // @Override
- // public void testPlusWithLongMaxIntMinInt() throws Exception {
- // // no longs in FastR
- // }
- //
- // @Override
- // public void testPlusWithLong() throws Exception {
- // // no longs in FastR
- // }
- //
- // @Override
- // public void testPrimitiveReturnTypeLong() throws Exception {
- // // no longs in FastR
- // }
- //
- // @Override
- // public void testPlusWithBytes() throws Exception {
- // // no bytes in FastR
- // }
- //
- // @Override
- // public void testPlusWithOneNegativeByte() throws Exception {
- // // no bytes in FastR
- // }
- //
- // @Override
- // public void testPlusWithShort() throws Exception {
- // // no shorts in FastR
- // }
- //
- // @Override
- // public void testPrimitiveReturnTypeShort() throws Exception {
- // // no shorts in FastR
- // }
- //
- // @Override
- // public void testGlobalObjectIsAccessible() throws Exception {
- // // no global object in fastr.
- // }
- //
- // @Override
- // public void testNullCanBeCastToAnything() throws Exception {
- // // TODO support
- // }
- //
- // @Override
- // public void multiplyTwoVariables() throws Exception {
- // // TODO support
- // }
- //
- // @Override
- // public void testEvaluateSource() throws Exception {
- // // TODO support
- // }
- //
- // @Override
- // public void testCopyComplexNumbersA() {
- // // TODO determine the semantics of assignments to a[i]$b
- // }
- //
- // @Override
- // public void testCopyComplexNumbersB() {
- // // TODO determine the semantics of assignments to a[i]$b
- // }
- //
- // @Override
- // public void testCopyStructuredComplexToComplexNumbersA() {
- // // TODO determine the semantics of assignments to a[i]$b
- // }
- //
- // @Override
- // public void testAddComplexNumbers() {
- // // TODO determine the semantics of assignments to a[i]$b
- // }
- //
- // @Override
- // public void testWriteToObjectWithElement() throws Exception {
- // // TODO mismatch between mutable and immutable data types
- // }
- //
- // @Override
- // public void testObjectWithValueAndAddProperty() throws Exception {
- // // TODO mismatch between mutable and immutable data types
- // }
- //
- // @Override
- // public void testCallMethod() throws Exception {
- // // R does not have method calls
- // }
- //
- // @Override
- // public String multiplyCode(String firstName, String secondName) {
- // return firstName + '*' + secondName;
- // }
- //
- // @Override
- // protected String[] metaObjects() {
- // return new String[]{
- // "intValue", "intType", "intVectorValue", "intType", "intSequenceValue", "intType",
- // "doubleValue", "doubleType", "doubleVectorValue", "doubleType", "doubleSequenceValue",
- // "doubleType",
- // "functionValue", "functionType",
- // "builtinFunctionValue", "builtinFunctionType"};
- // }
- //
- // @Override
- // protected String valueWithSource() {
- // return "valueWithSource";
- // }
- //
- // @Override
- // protected String objectWithKeyInfoAttributes() {
- // return "objectWithKeyInfoAttributes";
- // }
-}
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 55806c2ee097d3d3d60edd48461714036c09f159..83eb1a700ca15e6734de8e104773b7b971f0ca85 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -316,7 +316,7 @@ def _simple_generated_unit_tests():
return map(_test_subpackage, ['engine.shell', 'engine.interop', 'library.base', 'library.grid', 'library.fastrGrid', 'library.methods', 'library.stats', 'library.tools', 'library.utils', 'library.fastr', 'builtins', 'functions', 'parser', 'rffi', 'rng', 'runtime.data', 'S4'])
def _simple_unit_tests():
- return _simple_generated_unit_tests() + [_test_subpackage('tck')]
+ return _simple_generated_unit_tests() + ['com.oracle.truffle.tck.tests']
def _nodes_unit_tests():
return ['com.oracle.truffle.r.nodes.test', 'com.oracle.truffle.r.nodes.access.vector']
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 7e2d41105ddf58fe16de35e8d2965e15ffc012c2..2027fdf9965c5f3ae5957e6f8f20796603d3535e 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -29,7 +29,7 @@ suite = {
{
"name" : "truffle",
"subdir" : True,
- "version" : "e3ce4c4abc668fd637e64a467a8d5b999c2fbdae",
+ "version" : "05b61f9fa9dceebec447f3ec3656c8cc5be215dd",
"urls" : [
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -324,6 +324,16 @@ suite = {
"workingSets" : "FastR",
},
+ "com.oracle.truffle.r.test.tck" : {
+ "sourceDirs" : ["src"],
+ "dependencies" : [
+ "mx:JUNIT",
+ "sdk:POLYGLOT_TCK",
+ ],
+ "checkstyle" : "com.oracle.truffle.r.runtime",
+ "javaCompliance" : "1.8",
+ "workingSets" : "FastR,Test",
+ },
},
"distributions" : {
@@ -389,6 +399,20 @@ suite = {
],
},
+ "TRUFFLE_R_TCK" : {
+ "description" : "TCK tests provider",
+ "dependencies" : [
+ "com.oracle.truffle.r.test.tck"
+ ],
+ "exclude" : [
+ "mx:JUNIT",
+ ],
+ "distDependencies" : [
+ "sdk:POLYGLOT_TCK",
+ ],
+ "maven" : False
+ },
+
"FASTR_RELEASE<rffi>": {
"description" : "a binary release of FastR",
"dependencies" : ["com.oracle.truffle.r.release"],