Merge pull request #278 in G/fastr from ~LUKAS.STADLER_ORACLE.COM/fastr:feature/cleanups to master

* commit 'd89dbfb0':
  enable passing tests

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Syssleep.java

@@ -24,6 +24,6 @@ public class TestBuiltin_Syssleep extends TestBase {
 
     @Test
     public void testSyssleep2() {
-        assertEval(Ignored.Unknown, "argv <- list(FALSE); .Internal(Sys.sleep(argv[[1]]))");
+        assertEval("argv <- list(FALSE); .Internal(Sys.sleep(argv[[1]]))");
     }
 }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_all.java

@@ -29,13 +29,12 @@ public class TestBuiltin_all extends TestBase {
 
     @Test
     public void testall3() {
-        assertEval(Ignored.Unknown, "argv <- list(c(1, 1, 3, 1, 1, 3, 3, 3, 3), FALSE, NULL);all(argv[[1]],argv[[2]],argv[[3]]);");
+        assertEval(Output.IgnoreWarningContext, "argv <- list(c(1, 1, 3, 1, 1, 3, 3, 3, 3), FALSE, NULL);all(argv[[1]],argv[[2]],argv[[3]]);");
     }
 
     @Test
     public void testall4() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(c(0, 0, 3, 0, 0, 0, 1, 0, 0, 2, 2, 3.2, -1, 1, 3.2, 4, 3, 0, 0, 0, 0, 3.2, 0, 0, 3.2, 0, 202, 0, 0, 0, 241, 0, 243, 0, 0), .Dim = c(5L, 7L), .Dimnames = list(c('r1', 'r2', 'r3', 'r4', 'r5'), c('c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7'))));all(argv[[1]]);");
+        assertEval("argv <- list(structure(c(0, 0, 3, 0, 0, 0, 1, 0, 0, 2, 2, 3.2, -1, 1, 3.2, 4, 3, 0, 0, 0, 0, 3.2, 0, 0, 3.2, 0, 202, 0, 0, 0, 241, 0, 243, 0, 0), .Dim = c(5L, 7L), .Dimnames = list(c('r1', 'r2', 'r3', 'r4', 'r5'), c('c1', 'c2', 'c3', 'c4', 'c5', 'c6', 'c7'))));all(argv[[1]]);");
     }
 
     @Test
@@ -119,10 +118,10 @@ public class TestBuiltin_all extends TestBase {
 
         assertEval("{ all(TRUE, TRUE, NA,  na.rm=TRUE) }");
         // FIXME coercion warning missing
-        assertEval(Ignored.Unknown, "{ all(1) }");
-        assertEval(Ignored.Unknown, "{ all(0) }");
-        assertEval(Ignored.Unknown, "{ all(TRUE,c(TRUE,TRUE),1) }");
-        assertEval(Ignored.Unknown, "{ all(TRUE,c(TRUE,TRUE),1,0) }");
+        assertEval("{ all(1) }");
+        assertEval("{ all(0) }");
+        assertEval(Output.IgnoreWarningContext, "{ all(TRUE,c(TRUE,TRUE),1) }");
+        assertEval("{ all(TRUE,c(TRUE,TRUE),1,0) }");
 
         assertEval("{ all(NULL) }");
         assertEval("{ all(NULL, NULL) }");

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_any.java

@@ -39,7 +39,7 @@ public class TestBuiltin_any extends TestBase {
 
     @Test
     public void testany5() {
-        assertEval(Ignored.Unknown, "argv <- list(structure(c(14, 2, 0, 2, -7, 0), .Dim = c(3L, 2L)));any(argv[[1]]);");
+        assertEval("argv <- list(structure(c(14, 2, 0, 2, -7, 0), .Dim = c(3L, 2L)));any(argv[[1]]);");
     }
 
     @Test
@@ -94,7 +94,7 @@ public class TestBuiltin_any extends TestBase {
 
     @Test
     public void testany17() {
-        assertEval(Ignored.Unknown, "argv <- list('NA');do.call('any', argv)");
+        assertEval(Output.IgnoreWarningContext, "argv <- list('NA');do.call('any', argv)");
     }
 
     @Test
@@ -118,10 +118,8 @@ public class TestBuiltin_any extends TestBase {
 
         assertEval("{ any(NULL); }");
 
-        // FIXME coercion warning missing
-        assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ any(1) }");
-        // FIXME coercion warning missing
-        assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ any(0) }");
+        assertEval("{ any(1) }");
+        assertEval("{ any(0) }");
 
         assertEval("{ d<-data.frame(c(1L,2L), c(10L, 20L)); any(d) }");
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java

@@ -34,8 +34,7 @@ public class TestBuiltin_ascomplex extends TestBase {
 
     @Test
     public void testascomplex4() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(c(-0.626453810742332, 0.183643324222082, -0.835628612410047, 1.59528080213779, 0.329507771815361, -0.820468384118015, 0.487429052428485, 0.738324705129217, 0.575781351653492, -0.305388387156356, 1.51178116845085, 0.389843236411431, -0.621240580541804, -2.2146998871775, 1.12493091814311, -0.0449336090152309, -0.0161902630989461, 0.943836210685299, 0.821221195098089, 0.593901321217509, 0.918977371608218, 0.782136300731067, 0.0745649833651906, -1.98935169586337, 0.61982574789471), .Dim = c(5L, 5L), .Dimnames = list(c('1', '2', '3', '4', '5'), c('a', 'b', 'c', 'd', 'e'))));as.complex(argv[[1]]);");
+        assertEval("argv <- list(structure(c(-0.626453810742332, 0.183643324222082, -0.835628612410047, 1.59528080213779, 0.329507771815361, -0.820468384118015, 0.487429052428485, 0.738324705129217, 0.575781351653492, -0.305388387156356, 1.51178116845085, 0.389843236411431, -0.621240580541804, -2.2146998871775, 1.12493091814311, -0.0449336090152309, -0.0161902630989461, 0.943836210685299, 0.821221195098089, 0.593901321217509, 0.918977371608218, 0.782136300731067, 0.0745649833651906, -1.98935169586337, 0.61982574789471), .Dim = c(5L, 5L), .Dimnames = list(c('1', '2', '3', '4', '5'), c('a', 'b', 'c', 'd', 'e'))));as.complex(argv[[1]]);");
     }
 
     @Test

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_attach.java

@@ -51,6 +51,6 @@ public class TestBuiltin_attach extends TestBase {
 
     @Test
     public void sharingTests() {
-        assertEval(Ignored.Unimplemented, "d <- data.frame(colNameX=c(1,2,3)); attach(d); d$colNameX[1] <- 42; colNameX");
+        assertEval("d <- data.frame(colNameX=c(1,2,3)); attach(d); d$colNameX[1] <- 42; colNameX");
     }
 }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseAnd.java

@@ -34,7 +34,7 @@ public class TestBuiltin_bitwiseAnd extends TestBase {
         assertEval("{ bitwAnd(c(10L,20L,30L,40L), c(3,5,7)) }");
         assertEval("{ bitwAnd(c(10.5,11.6,17.8), c(5L,7L,8L)) }");
 
-        assertEval(Ignored.Unknown, "{ bitwAnd(NULL, NULL) }");
+        assertEval(Output.IgnoreErrorContext, "{ bitwAnd(NULL, NULL) }");
         assertEval(Ignored.Unknown, "{ bitwAnd(c(), c(1,2,3)) }");
         // Error message mismatch
         assertEval(Output.IgnoreErrorMessage, "{ bitwAnd(c(1,2,3,4), c(TRUE)) }");

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftL.java

@@ -32,9 +32,9 @@ public class TestBuiltin_bitwiseShiftL extends TestBase {
         assertEval("{ bitwShiftL(TRUE, c(TRUE, FALSE)) }");
 
         // Error message mismatch
-        assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ bitwShiftL(c(3+3i), c(3,2,4)) }");
+        assertEval(Output.IgnoreErrorContext, "{ bitwShiftL(c(3+3i), c(3,2,4)) }");
         // Warning message mismatch
-        assertEval(Ignored.Unknown, "{ bitwShiftL(c(3,2,4), c(3+3i)) }");
+        assertEval(Output.IgnoreWarningContext, "{ bitwShiftL(c(3,2,4), c(3+3i)) }");
         // No warning message printed for NAs produced by coercion
         assertEval("{ bitwShiftL(c(1,2,3,4), c(\"a\")) }");
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftR.java

@@ -28,7 +28,7 @@ public class TestBuiltin_bitwiseShiftR extends TestBase {
         assertEval("{ bitwShiftR(c(100,200,300), 1) }");
         assertEval("{ bitwShiftR(c(25,57,66), c(10,20,30,40,50,60)) }");
 
-        assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ bitwShiftR(c(3,2,4), c(3+3i)) }");
+        assertEval(Output.IgnoreWarningContext, "{ bitwShiftR(c(3,2,4), c(3+3i)) }");
 
         // No warning message printed for NAs produced by coercion
         assertEval(Ignored.Unknown, "{ bitwShiftR(c(1,2,3,4), c(\"Hello\")) }");

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cumsum.java

@@ -108,7 +108,7 @@ public class TestBuiltin_cumsum extends TestBase {
 
         assertEval(Ignored.Unknown, "{ cumsum(c(1,2,3,0/0,5)) }");
         assertEval(Ignored.Unknown, "{ cumsum(c(1,0/0,5+1i)) }");
-        assertEval(Ignored.Unknown, "{ cumsum(as.raw(1:6)) }");
+        assertEval("{ cumsum(as.raw(1:6)) }");
         // FIXME 1e+308
         assertEval(Ignored.Unknown, "{ cumsum(rep(1e308, 3) ) }");
         // FIXME 1e+308

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_formals.java

@@ -24,18 +24,17 @@ public class TestBuiltin_formals extends TestBase {
 
     @Test
     public void testformals2() {
-        assertEval(Ignored.Unknown, "argv <- list(logical(0)); .Internal(formals(argv[[1]]))");
+        assertEval("argv <- list(logical(0)); .Internal(formals(argv[[1]]))");
     }
 
     @Test
     public void testformals3() {
-        assertEval(Ignored.Unknown, "argv <- list(structure(numeric(0), .Dim = c(0L, 0L))); .Internal(formals(argv[[1]]))");
+        assertEval("argv <- list(structure(numeric(0), .Dim = c(0L, 0L))); .Internal(formals(argv[[1]]))");
     }
 
     @Test
     public void testformals4() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame')); .Internal(formals(argv[[1]]))");
+        assertEval("argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame')); .Internal(formals(argv[[1]]))");
     }
 
     @Test

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isNamespaceEnv.java

@@ -19,17 +19,16 @@ public class TestBuiltin_isNamespaceEnv extends TestBase {
 
     @Test
     public void testisNamespaceEnv1() {
-        assertEval(Ignored.Unknown, "argv <- list(FALSE); .Internal(isNamespaceEnv(argv[[1]]))");
+        assertEval("argv <- list(FALSE); .Internal(isNamespaceEnv(argv[[1]]))");
     }
 
     @Test
     public void testisNamespaceEnv2() {
-        assertEval(Ignored.Unknown, "argv <- list(structure(numeric(0), .Dim = c(0L, 0L))); .Internal(isNamespaceEnv(argv[[1]]))");
+        assertEval("argv <- list(structure(numeric(0), .Dim = c(0L, 0L))); .Internal(isNamespaceEnv(argv[[1]]))");
     }
 
     @Test
     public void testisNamespaceEnv3() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame')); .Internal(isNamespaceEnv(argv[[1]]))");
+        assertEval("argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame')); .Internal(isNamespaceEnv(argv[[1]]))");
     }
 }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_matrix.java

@@ -134,8 +134,7 @@ public class TestBuiltin_matrix extends TestBase {
 
     @Test
     public void testmatrix24() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(c(TRUE, FALSE, FALSE, TRUE), 2L, 2L, TRUE, NULL, FALSE, FALSE); .Internal(matrix(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]]))");
+        assertEval("argv <- list(c(TRUE, FALSE, FALSE, TRUE), 2L, 2L, TRUE, NULL, FALSE, FALSE); .Internal(matrix(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]]))");
     }
 
     @Test
@@ -180,8 +179,7 @@ public class TestBuiltin_matrix extends TestBase {
 
     @Test
     public void testmatrix33() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(c(1+2i, 3-4i, 5+0i, -6+0i), 2L, 2L, TRUE, NULL, FALSE, FALSE); .Internal(matrix(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]]))");
+        assertEval("argv <- list(c(1+2i, 3-4i, 5+0i, -6+0i), 2L, 2L, TRUE, NULL, FALSE, FALSE); .Internal(matrix(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]]))");
     }
 
     @Test

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java

@@ -217,7 +217,7 @@ public class TestBuiltin_max extends TestBase {
 
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ max(integer(0)) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ max(integer()) }");
-        assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ max(as.double(NA), na.rm=TRUE) }");
+        assertEval(Output.IgnoreWarningContext, "{ max(as.double(NA), na.rm=TRUE) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ max(as.integer(NA), na.rm=TRUE) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ max(as.integer(NA), as.integer(NA), na.rm=TRUE) }");
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_min.java

@@ -175,7 +175,7 @@ public class TestBuiltin_min extends TestBase {
 
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ min(integer(0)) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ min(integer()) }");
-        assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ min(as.double(NA), na.rm=TRUE) }");
+        assertEval(Output.IgnoreWarningContext, "{ min(as.double(NA), na.rm=TRUE) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ min(as.integer(NA), na.rm=TRUE) }");
         assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ min(as.integer(NA), as.integer(NA), na.rm=TRUE) }");
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java

@@ -146,8 +146,7 @@ public class TestBuiltin_operators extends TestBase {
 
     @Test
     public void testoperators26() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(c(1+1i, 2+2i, 1.2+10i, 2.4+20i), .Dim = c(2L, 2L), .Dimnames = list(c('x', ''), c('a', 'b'))), 3.14159265358979);`+`(argv[[1]],argv[[2]]);");
+        assertEval("argv <- list(structure(c(1+1i, 2+2i, 1.2+10i, 2.4+20i), .Dim = c(2L, 2L), .Dimnames = list(c('x', ''), c('a', 'b'))), 3.14159265358979);`+`(argv[[1]],argv[[2]]);");
     }
 
     @Test

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_strsplit.java

@@ -97,8 +97,7 @@ public class TestBuiltin_strsplit extends TestBase {
 
     @Test
     public void teststrsplit16() {
-        assertEval(Ignored.Unknown,
-                        "argv <- list(structure(c('1', '2', '3', '4', '5', '1', '2', '3', '4', '5'), .Dim = 10L), '.', TRUE, FALSE, FALSE); .Internal(strsplit(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]]))");
+        assertEval("argv <- list(structure(c('1', '2', '3', '4', '5', '1', '2', '3', '4', '5'), .Dim = 10L), '.', TRUE, FALSE, FALSE); .Internal(strsplit(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]]))");
     }
 
     @Test