From 325d38821b1bd10fcdd31ad3c435f281c345ce32 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Mon, 13 Jun 2016 15:28:46 +0200
Subject: [PATCH] rename ContainsError to IgnoreErrorContext, etc.
---
.../com/oracle/truffle/r/test/S4/TestS4.java | 26 +-
.../com/oracle/truffle/r/test/TestBase.java | 24 +-
.../com/oracle/truffle/r/test/TestRBase.java | 4 +-
.../r/test/builtins/TestBuiltin_Recall.java | 2 +-
.../r/test/builtins/TestBuiltin_any.java | 4 +-
.../builtins/TestBuiltin_anyDuplicated.java | 4 +-
.../r/test/builtins/TestBuiltin_aperm.java | 12 +-
.../test/builtins/TestBuiltin_ascomplex.java | 4 +-
.../r/test/builtins/TestBuiltin_asdouble.java | 10 +-
.../builtins/TestBuiltin_asexpression.java | 2 +-
.../test/builtins/TestBuiltin_asinteger.java | 10 +-
.../r/test/builtins/TestBuiltin_asmatrix.java | 4 +-
.../r/test/builtins/TestBuiltin_asraw.java | 20 +-
.../r/test/builtins/TestBuiltin_asvector.java | 12 +-
.../test/builtins/TestBuiltin_bitwiseAnd.java | 2 +-
.../test/builtins/TestBuiltin_bitwiseNot.java | 2 +-
.../test/builtins/TestBuiltin_bitwiseOr.java | 2 +-
.../builtins/TestBuiltin_bitwiseShiftL.java | 4 +-
.../builtins/TestBuiltin_bitwiseShiftR.java | 2 +-
.../test/builtins/TestBuiltin_bitwiseXor.java | 2 +-
.../r/test/builtins/TestBuiltin_cbind.java | 2 +-
.../r/test/builtins/TestBuiltin_chol.java | 2 +-
.../builtins/TestBuiltin_classassign.java | 2 +-
.../r/test/builtins/TestBuiltin_col.java | 2 +-
.../test/builtins/TestBuiltin_copyDFattr.java | 24 +-
.../builtins/TestBuiltin_delayedAssign.java | 4 +-
.../r/test/builtins/TestBuiltin_dfltWarn.java | 8 +-
.../r/test/builtins/TestBuiltin_digamma.java | 2 +-
.../r/test/builtins/TestBuiltin_dim.java | 2 +-
.../r/test/builtins/TestBuiltin_docall.java | 4 +-
.../test/builtins/TestBuiltin_duplicated.java | 4 +-
.../TestBuiltin_extract_dataframe.java | 4 +-
.../r/test/builtins/TestBuiltin_factor.java | 32 +-
.../r/test/builtins/TestBuiltin_get.java | 8 +-
.../r/test/builtins/TestBuiltin_grep.java | 2 +-
.../r/test/builtins/TestBuiltin_gsub.java | 2 +-
.../test/builtins/TestBuiltin_intToBits.java | 6 +-
.../test/builtins/TestBuiltin_invisible.java | 4 +-
.../r/test/builtins/TestBuiltin_isfactor.java | 2 +-
.../builtins/TestBuiltin_islistfactor.java | 2 +-
.../r/test/builtins/TestBuiltin_isna.java | 4 +-
.../r/test/builtins/TestBuiltin_lgamma.java | 4 +-
.../test/builtins/TestBuiltin_makenames.java | 6 +-
.../test/builtins/TestBuiltin_makeunique.java | 6 +-
.../r/test/builtins/TestBuiltin_matchfun.java | 6 +-
.../r/test/builtins/TestBuiltin_max.java | 22 +-
.../r/test/builtins/TestBuiltin_mean.java | 2 +-
.../builtins/TestBuiltin_meandefault.java | 2 +-
.../r/test/builtins/TestBuiltin_min.java | 20 +-
.../builtins/TestBuiltin_namesassign.java | 6 +-
.../r/test/builtins/TestBuiltin_ngettext.java | 18 +-
.../builtins/TestBuiltin_normalizePath.java | 2 +-
.../test/builtins/TestBuiltin_operators.java | 44 +-
.../r/test/builtins/TestBuiltin_pmax.java | 10 +-
.../r/test/builtins/TestBuiltin_pmin.java | 10 +-
.../r/test/builtins/TestBuiltin_qr.java | 2 +-
.../r/test/builtins/TestBuiltin_quote.java | 4 +-
.../r/test/builtins/TestBuiltin_range.java | 8 +-
.../r/test/builtins/TestBuiltin_rawShift.java | 6 +-
.../r/test/builtins/TestBuiltin_rbind.java | 2 +-
.../r/test/builtins/TestBuiltin_repint.java | 2 +-
.../r/test/builtins/TestBuiltin_rowMeans.java | 2 +-
.../r/test/builtins/TestBuiltin_rowSums.java | 2 +-
.../r/test/builtins/TestBuiltin_scan.java | 4 +-
.../r/test/builtins/TestBuiltin_sep.java | 4 +-
.../r/test/builtins/TestBuiltin_seq.java | 10 +-
.../r/test/builtins/TestBuiltin_seqint.java | 4 +-
.../builtins/TestBuiltin_seterrmessage.java | 2 +-
.../r/test/builtins/TestBuiltin_substr.java | 12 +-
.../r/test/builtins/TestBuiltin_switch.java | 2 +-
.../r/test/builtins/TestBuiltin_unlist.java | 2 +-
.../r/test/builtins/TestMiscBuiltins.java | 12 +-
.../r/test/functions/TestFunctions.java | 30 +-
.../library/base/TestConditionHandling.java | 2 +-
.../r/test/library/base/TestConnections.java | 2 +-
.../r/test/library/base/TestEnvironments.java | 22 +-
.../library/base/TestSimpleArithmetic.java | 54 +-
.../r/test/library/base/TestSimpleArrays.java | 14 +-
.../library/base/TestSimpleComparison.java | 28 +-
.../library/base/TestSimpleDataFrames.java | 14 +-
.../library/base/TestSimpleIfEvaluator.java | 44 +-
.../r/test/library/base/TestSimpleLoop.java | 8 +-
.../library/base/TestSimpleSequences.java | 4 +-
.../test/library/base/TestSimpleTruffle.java | 2 +-
.../r/test/library/base/TestSimpleValues.java | 8 +-
.../test/library/base/TestSimpleVectors.java | 554 +++++++++---------
.../r/test/library/stats/TestStats.java | 6 +-
.../truffle/r/test/parser/TestParser.java | 6 +-
88 files changed, 655 insertions(+), 655 deletions(-)
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java
index b8407b06be..92e8441ae3 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java
@@ -36,7 +36,7 @@ public class TestS4 extends TestRBase {
public void testSlotAccess() {
assertEval("{ `@`(getClass(\"ClassUnionRepresentation\"), virtual) }");
assertEval("{ `@`(getClass(\"ClassUnionRepresentation\"), \"virtual\") }");
- assertEval(Output.ContainsError, "{ `@`(getClass(\"ClassUnionRepresentation\"), c(\"virtual\", \"foo\")) }");
+ assertEval(Output.IgnoreErrorContext, "{ `@`(getClass(\"ClassUnionRepresentation\"), c(\"virtual\", \"foo\")) }");
assertEval("{ getClass(\"ClassUnionRepresentation\")@virtual }");
assertEval("{ getClass(\"ClassUnionRepresentation\")@.S3Class }");
assertEval("{ c(42)@.Data }");
@@ -45,16 +45,16 @@ public class TestS4 extends TestRBase {
assertEval("{ x<-42; slot(x, \".Data\") }");
assertEval("{ setClass(\"foo\", contains=\"numeric\"); x<-new(\"foo\"); res<-x@.Data; removeClass(\"foo\"); res }");
assertEval("{ setClass(\"foo\", contains=\"numeric\"); x<-new(\"foo\"); res<-slot(x, \".Data\"); removeClass(\"foo\"); res }");
- assertEval(Output.ContainsError, "{ getClass(\"ClassUnionRepresentation\")@foo }");
- assertEval(Output.ContainsError, "{ c(42)@foo }");
- assertEval(Output.ContainsError, " { x<-42; attr(x, \"foo\")<-7; x@foo }");
+ assertEval(Output.IgnoreErrorContext, "{ getClass(\"ClassUnionRepresentation\")@foo }");
+ assertEval(Output.IgnoreErrorContext, "{ c(42)@foo }");
+ assertEval(Output.IgnoreErrorContext, " { x<-42; attr(x, \"foo\")<-7; x@foo }");
assertEval("{ x<-42; attr(x, \"foo\")<-7; slot(x, \"foo\") }");
- assertEval(Output.ContainsError, "{ x<-c(42); class(x)<-\"bar\"; x@foo }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(42); class(x)<-\"bar\"; x@foo }");
assertEval("{ x<-getClass(\"ClassUnionRepresentation\"); slot(x, \"virtual\") }");
- assertEval(Output.ContainsError, "{ x<-getClass(\"ClassUnionRepresentation\"); slot(x, virtual) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-getClass(\"ClassUnionRepresentation\"); slot(x, virtual) }");
assertEval("{ x<-function() 42; attr(x, \"foo\")<-7; y<-asS4(x); y@foo }");
- assertEval(Output.ContainsError, "{ x<-NULL; `@`(x, foo) }");
- assertEval(Output.ContainsError, "{ x<-NULL; x@foo }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-NULL; `@`(x, foo) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-NULL; x@foo }");
assertEval("{ x<-paste0(\".\", \"Data\"); y<-42; slot(y, x) }");
}
@@ -64,11 +64,11 @@ public class TestS4 extends TestRBase {
assertEval("{ x<-getClass(\"ClassUnionRepresentation\"); slot(x, \"virtual\", check=TRUE)<-TRUE; x@virtual }");
assertEval("{ x<-initialize@valueClass; initialize@valueClass<-\"foo\"; initialize@valueClass<-x }");
- assertEval(Output.ContainsError, "{ x<-function() 42; attr(x, \"foo\")<-7; y@foo<-42 }");
- assertEval(Output.ContainsError, "{ x<-function() 42; attr(x, \"foo\")<-7; slot(y, \"foo\")<-42 }");
- assertEval(Output.ContainsError, "{ x<-function() 42; attr(x, \"foo\")<-7; y<-asS4(x); y@foo<-42 }");
- assertEval(Output.ContainsError, "{ x<-NULL; `@<-`(x, foo, \"bar\") }");
- assertEval(Output.ContainsError, "{ x<-NULL; x@foo<-\"bar\" }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-function() 42; attr(x, \"foo\")<-7; y@foo<-42 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-function() 42; attr(x, \"foo\")<-7; slot(y, \"foo\")<-42 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-function() 42; attr(x, \"foo\")<-7; y<-asS4(x); y@foo<-42 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-NULL; `@<-`(x, foo, \"bar\") }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-NULL; x@foo<-\"bar\" }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
index b4a87cb576..3489a72915 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestBase.java
@@ -63,11 +63,11 @@ public class TestBase {
public static final boolean ProcessFailedTests = Boolean.getBoolean("ProcessFailedTests");
public enum Output implements TestTrait {
- ContainsError, // the error context is ignored (e.g., "a+b" vs. "a + b")
- ContainsAmbiguousError, // the actual error message is ignored
- ContainsWarning, // the warning context is ignored
- MayContainError,
- MayContainWarning,
+ IgnoreErrorContext, // the error context is ignored (e.g., "a+b" vs. "a + b")
+ IgnoreErrorMessage, // the actual error message is ignored
+ IgnoreWarningContext, // the warning context is ignored
+ MayIgnoreErrorContext,
+ MayIgnoreWarningContext,
IgnoreWhitespace;
}
@@ -346,8 +346,8 @@ public class TestBase {
protected static final String WARNING = "Warning message";
/**
- * If this is set to {@code true}, {@link Output#ContainsError} will compare the full output
- * instead of truncating leading "Error" strings and such. This means it will behave like
+ * If this is set to {@code true}, {@link Output#IgnoreErrorContext} will compare the full
+ * output instead of truncating leading "Error" strings and such. This means it will behave like
* {@link #assertEval}.
*/
private static final boolean FULL_COMPARE_ERRORS = false;
@@ -452,11 +452,11 @@ public class TestBase {
boolean ignored = TestTrait.contains(traits, Ignored.class) ^ (ProcessFailedTests && !(TestTrait.contains(traits, Ignored.Unstable) || TestTrait.contains(traits, Ignored.SideEffects)));
- boolean containsWarning = TestTrait.contains(traits, Output.ContainsWarning);
- boolean containsError = (!FULL_COMPARE_ERRORS && (TestTrait.contains(traits, Output.ContainsError) || TestTrait.contains(traits, Output.ContainsAmbiguousError)));
- boolean mayContainWarning = TestTrait.contains(traits, Output.MayContainWarning);
- boolean mayContainError = TestTrait.contains(traits, Output.MayContainError);
- boolean ambiguousError = TestTrait.contains(traits, Output.ContainsAmbiguousError);
+ boolean containsWarning = TestTrait.contains(traits, Output.IgnoreWarningContext);
+ boolean containsError = (!FULL_COMPARE_ERRORS && (TestTrait.contains(traits, Output.IgnoreErrorContext) || TestTrait.contains(traits, Output.IgnoreErrorMessage)));
+ boolean mayContainWarning = TestTrait.contains(traits, Output.MayIgnoreWarningContext);
+ boolean mayContainError = TestTrait.contains(traits, Output.MayIgnoreErrorContext);
+ boolean ambiguousError = TestTrait.contains(traits, Output.IgnoreErrorMessage);
boolean ignoreWhitespace = TestTrait.contains(traits, Output.IgnoreWhitespace);
boolean nonSharedContext = TestTrait.contains(traits, Context.NonShared);
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
index 055d9d1d32..3e941446be 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/TestRBase.java
@@ -84,9 +84,9 @@ public class TestRBase extends TestBase {
if (l.startsWith("#")) {
// check the first line for configuration options
if (l.contains("ContainsError")) {
- testTrait = Output.ContainsError;
+ testTrait = Output.IgnoreErrorContext;
} else if (l.contains("ContainsWarning")) {
- testTrait = Output.ContainsWarning;
+ testTrait = Output.IgnoreWarningContext;
}
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Recall.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Recall.java
index c04308a373..beaf7bfb0e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Recall.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_Recall.java
@@ -22,7 +22,7 @@ public class TestBuiltin_Recall extends TestBase {
assertEval("{ f<-function(i) { if(i<=1) 1 else i*Recall(i-1) } ; f(10) }");
assertEval("{ f<-function(i) { if(i<=1) 1 else i*Recall(i-1) } ; g <- f ; f <- sum ; g(10) }");
assertEval("{ f<-function(i) { if (i==1) { 1 } else if (i==2) { 1 } else { Recall(i-1) + Recall(i-2) } } ; f(10) }");
- assertEval(Output.ContainsError, "{ Recall(10) }");
+ assertEval(Output.IgnoreErrorContext, "{ Recall(10) }");
// Recall with more then 1 argument
assertEval("{ f <- function(tarDepth,curDepth) { if (tarDepth == curDepth) {curDepth} else {Recall(tarDepth,curDepth+1)}}; f(3,0) }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_any.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_any.java
index ad1ff5202c..55e38d938b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_any.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_any.java
@@ -119,9 +119,9 @@ public class TestBuiltin_any extends TestBase {
assertEval("{ any(NULL); }");
// FIXME coercion warning missing
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ any(1) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ any(1) }");
// FIXME coercion warning missing
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ any(0) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ any(0) }");
assertEval("{ d<-data.frame(c(1L,2L), c(10L, 20L)); any(d) }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_anyDuplicated.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_anyDuplicated.java
index ccaa13b7dc..4f6b89d198 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_anyDuplicated.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_anyDuplicated.java
@@ -153,7 +153,7 @@ public class TestBuiltin_anyDuplicated extends TestBase {
assertEval("{ anyDuplicated(c(1+1i, 4-6i, 4-6i, 6+7i)) }");
assertEval("{ anyDuplicated(c(1, 4+6i, 7+7i, 1), incomparables = c(1, 2)) }");
- assertEval(Output.ContainsWarning, "{ anyDuplicated(c(1L, 2L, 1L, 1L, 3L, 2L), incomparables = \"cat\") }");
- assertEval(Output.ContainsWarning, "{ anyDuplicated(c(1,2,3,2), incomparables = c(2+6i)) }");
+ assertEval(Output.IgnoreWarningContext, "{ anyDuplicated(c(1L, 2L, 1L, 1L, 3L, 2L), incomparables = \"cat\") }");
+ assertEval(Output.IgnoreWarningContext, "{ anyDuplicated(c(1,2,3,2), incomparables = c(2+6i)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_aperm.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_aperm.java
index 3fae95cc8f..f5ab818347 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_aperm.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_aperm.java
@@ -194,22 +194,22 @@ public class TestBuiltin_aperm extends TestBase {
assertEval("{ aperm(array(c('FASTR', 'IS', 'SO', 'FAST'), c(3,1,2))) }");
// perm specified in complex numbers produces warning
- assertEval(Output.ContainsWarning, "{ aperm(array(1:27,c(3,3,3)), c(1+1i,3+3i,2+2i))[1,2,3] == array(1:27,c(3,3,3))[1,3,2]; }");
+ assertEval(Output.IgnoreWarningContext, "{ aperm(array(1:27,c(3,3,3)), c(1+1i,3+3i,2+2i))[1,2,3] == array(1:27,c(3,3,3))[1,3,2]; }");
// perm is not a permutation vector
- assertEval(Output.ContainsError, "{ aperm(array(1,c( 3,3,3)), c(1,2,1)); }");
+ assertEval(Output.IgnoreErrorContext, "{ aperm(array(1,c( 3,3,3)), c(1,2,1)); }");
// perm value out of bounds
- assertEval(Output.ContainsError, "{ aperm(array(1,c(3,3,3)), c(1,2,0)); }");
+ assertEval(Output.IgnoreErrorContext, "{ aperm(array(1,c(3,3,3)), c(1,2,0)); }");
// first argument not an array
- assertEval(Output.ContainsError, "{ aperm(c(1,2,3)); }");
+ assertEval(Output.IgnoreErrorContext, "{ aperm(c(1,2,3)); }");
// Invalid first argument, not array
- assertEval(Output.ContainsError, "{ aperm(c(c(2,3), c(4,5), c(6,7)), c(3,4)) }");
+ assertEval(Output.IgnoreErrorContext, "{ aperm(c(c(2,3), c(4,5), c(6,7)), c(3,4)) }");
// invalid perm length
- assertEval(Output.ContainsError, "{ aperm(array(1,c(3,3,3)), c(1,2)); }");
+ assertEval(Output.IgnoreErrorContext, "{ aperm(array(1,c(3,3,3)), c(1,2)); }");
// Complex Vector
assertEval("{ aperm(array(c(3+2i, 5+0i, 1+3i, 5-3i), c(2,2,2))) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java
index 2f3ec1802a..bdd5b4596b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ascomplex.java
@@ -83,8 +83,8 @@ public class TestBuiltin_ascomplex extends TestBase {
assertEval("{ as.complex(\"-1-5i\") }");
assertEval("{ as.complex(0/0) }");
assertEval("{ as.complex(c(0/0, 0/0)) }");
- assertEval(Output.ContainsWarning, "{ as.complex(c(\"1\",\"hello\")) }");
- assertEval(Output.ContainsWarning, "{ as.complex(\"TRUE\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.complex(c(\"1\",\"hello\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.complex(\"TRUE\") }");
assertEval("{ x<-c(a=1.1, b=2.2); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.complex(x); attributes(y) }");
assertEval("{ x<-c(a=1L, b=2L); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.complex(x); attributes(y) }");
assertEval("{ as.complex(\"Inf\") }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asdouble.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asdouble.java
index 51298bb032..be3fdc04e5 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asdouble.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asdouble.java
@@ -59,7 +59,7 @@ public class TestBuiltin_asdouble extends TestBase {
@Test
public void testasdouble9() {
- assertEval(Output.ContainsWarning, "argv <- list(c('-.1', ' 2.7 ', 'B'));as.double(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(c('-.1', ' 2.7 ', 'B'));as.double(argv[[1]]);");
}
@Test
@@ -178,10 +178,10 @@ public class TestBuiltin_asdouble extends TestBase {
assertEval("{ as.double(\"1.27\") }");
assertEval("{ as.double(1L) }");
assertEval("{ as.double(as.raw(1)) }");
- assertEval(Output.ContainsWarning, "{ as.double(c(\"1\",\"hello\")) }");
- assertEval(Output.ContainsWarning, "{ as.double(\"TRUE\") }");
- assertEval(Output.ContainsWarning, "{ as.double(10+2i) }");
- assertEval(Output.ContainsWarning, "{ as.double(c(3+3i, 4+4i)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.double(c(\"1\",\"hello\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.double(\"TRUE\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.double(10+2i) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.double(c(3+3i, 4+4i)) }");
assertEval("{ x<-c(a=1.1, b=2.2); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.double(x); attributes(y) }");
assertEval("{ x<-c(a=1L, b=2L); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.double(x); attributes(y) }");
assertEval("{ as.double(NULL) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asexpression.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asexpression.java
index 900fbd5d0f..cfa9f221b2 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asexpression.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asexpression.java
@@ -32,7 +32,7 @@ public class TestBuiltin_asexpression extends TestBase {
assertEval("{ as.expression(c(1,2)) }");
assertEval("{ as.expression(list(1,2)) }");
assertEval("{ as.expression(list(\"x\" = 1, \"y\" = 2)) }");
- assertEval(Output.ContainsError, "{ as.expression(sum) }");
+ assertEval(Output.IgnoreErrorContext, "{ as.expression(sum) }");
assertEval("{ as.expression(function()) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java
index d28be36a87..90ef68d16f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asinteger.java
@@ -96,7 +96,7 @@ public class TestBuiltin_asinteger extends TestBase {
@Test
public void testasinteger17() {
- assertEval(Ignored.Unknown, Output.ContainsWarning,
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext,
"argv <- list(structure(c(100, -1e-13, Inf, -Inf, NaN, 3.14159265358979, NA), .Names = c(' 100', '-1e-13', ' Inf', '-Inf', ' NaN', '3.14', ' NA')));as.integer(argv[[1]]);");
}
@@ -124,8 +124,8 @@ public class TestBuiltin_asinteger extends TestBase {
assertEval("{ as.integer(0/0) }");
assertEval("{ as.integer(-0/0) }");
assertEval("{ as.integer(as.raw(c(1,2,3,4))) }");
- assertEval(Output.ContainsWarning, "{ as.integer(10+2i) }");
- assertEval(Output.ContainsWarning, "{ as.integer(c(3+3i, 4+4i)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.integer(10+2i) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.integer(c(3+3i, 4+4i)) }");
assertEval("{ as.integer(10000000000000) }");
assertEval("{ as.integer(list(c(1),2,3)) }");
assertEval("{ as.integer(list(integer(),2,3)) }");
@@ -133,8 +133,8 @@ public class TestBuiltin_asinteger extends TestBase {
assertEval("{ as.integer(list(1,2,3,list())) }");
assertEval("{ as.integer(10000000000) }");
assertEval("{ as.integer(-10000000000) }");
- assertEval(Output.ContainsWarning, "{ as.integer(c(\"1\",\"hello\")) }");
- assertEval(Output.ContainsWarning, "{ as.integer(\"TRUE\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.integer(c(\"1\",\"hello\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.integer(\"TRUE\") }");
assertEval("{ as.integer(as.raw(1)) }");
assertEval("{ x<-c(a=1.1, b=2.2); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.integer(x); attributes(y) }");
assertEval("{ x<-c(a=1L, b=2L); dim(x)<-c(1,2); attr(x, \"foo\")<-\"foo\"; y<-as.integer(x); attributes(y) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asmatrix.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asmatrix.java
index 461eda3b4c..87f96d1f23 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asmatrix.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asmatrix.java
@@ -74,8 +74,8 @@ public class TestBuiltin_asmatrix extends TestBase {
assertEval("{ matrix(c(NaN,4+5i,2+0i,5+10i)} ");
// FIXME missing warning
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ matrix(c(1,2,3,4),3,2) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ matrix(1:4,3,2) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ matrix(c(1,2,3,4),3,2) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ matrix(1:4,3,2) }");
assertEval("{ x<-matrix(integer(), ncol=2) }");
assertEval("{ x<-matrix(integer(), nrow=2) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asraw.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asraw.java
index 85f5530676..0de508e8b1 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asraw.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asraw.java
@@ -58,15 +58,15 @@ public class TestBuiltin_asraw extends TestBase {
assertEval("{ as.raw(list(1,2,3)) }");
assertEval("{ as.raw(list(\"1\", 2L, 3.4)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(1+1i) }");
- assertEval(Output.ContainsWarning, "{ as.raw(-1) }");
- assertEval(Output.ContainsWarning, "{ as.raw(-1L) }");
- assertEval(Output.ContainsWarning, "{ as.raw(NA) }");
- assertEval(Output.ContainsWarning, "{ as.raw(\"test\") }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1+3i, -2-1i, NA)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1, -2, 3)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1,1000,NA)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1L, -2L, 3L)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1L, -2L, NA)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(1+1i) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(-1) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(-1L) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(NA) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(\"test\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1+3i, -2-1i, NA)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1, -2, 3)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1,1000,NA)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1L, -2L, 3L)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1L, -2L, NA)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asvector.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asvector.java
index 258dec1daa..98c022e450 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asvector.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_asvector.java
@@ -397,16 +397,16 @@ public class TestBuiltin_asvector extends TestBase {
@Test
public void testAsVector() {
- assertEval(Output.ContainsWarning, "{ as.vector(\"foo\", \"integer\") }");
- assertEval(Output.ContainsWarning, "{ as.vector(\"foo\", \"double\") }");
- assertEval(Output.ContainsWarning, "{ as.vector(\"foo\", \"numeric\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.vector(\"foo\", \"integer\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.vector(\"foo\", \"double\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.vector(\"foo\", \"numeric\") }");
assertEval("{ as.vector(\"foo\", \"logical\") }");
- assertEval(Output.ContainsWarning, "{ as.vector(\"foo\", \"raw\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.vector(\"foo\", \"raw\") }");
assertEval("{ as.vector(\"foo\", \"character\") }");
assertEval("{ as.vector(\"foo\", \"list\") }");
assertEval("{ as.vector(\"foo\") }");
- assertEval(Output.ContainsError, "{ as.vector(\"foo\", \"bar\") }");
- assertEval(Output.ContainsWarning, "{ as.vector(c(\"foo\", \"bar\"), \"raw\") }");
+ assertEval(Output.IgnoreErrorContext, "{ as.vector(\"foo\", \"bar\") }");
+ assertEval(Output.IgnoreWarningContext, "{ as.vector(c(\"foo\", \"bar\"), \"raw\") }");
assertEval("x<-c(a=1.1, b=2.2); as.vector(x, \"raw\")");
assertEval("x<-c(a=1L, b=2L); as.vector(x, \"complex\")");
assertEval("{ x<-c(a=FALSE, b=TRUE); attr(x, \"foo\")<-\"foo\"; y<-as.vector(x); attributes(y) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseAnd.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseAnd.java
index 26859c580d..bc5109260f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseAnd.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseAnd.java
@@ -37,6 +37,6 @@ public class TestBuiltin_bitwiseAnd extends TestBase {
assertEval(Ignored.Unknown, "{ bitwAnd(NULL, NULL) }");
assertEval(Ignored.Unknown, "{ bitwAnd(c(), c(1,2,3)) }");
// Error message mismatch
- assertEval(Output.ContainsError, "{ bitwAnd(c(1,2,3,4), c(TRUE)) }");
+ assertEval(Output.IgnoreErrorContext, "{ bitwAnd(c(1,2,3,4), c(TRUE)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseNot.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseNot.java
index 1e359e79db..256dbc9038 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseNot.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseNot.java
@@ -27,6 +27,6 @@ public class TestBuiltin_bitwiseNot extends TestBase {
assertEval("{ bitwNot(c(17,24,34,48,51,66,72,99)) }");
assertEval("{ bitwNot(c(0,100,200,50,70,20)) }");
- assertEval(Output.ContainsError, "{ bitwNot(TRUE) }");
+ assertEval(Output.IgnoreErrorContext, "{ bitwNot(TRUE) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseOr.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseOr.java
index ebed414178..607ca2ddba 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseOr.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseOr.java
@@ -27,6 +27,6 @@ public class TestBuiltin_bitwiseOr extends TestBase {
assertEval("{ bitwOr(c(10,11,12,13,14,15), c(1,1,1,1,1,1)) }");
assertEval("{ bitwOr(c(25,57,66), c(10,20,30,40,50,60)) }");
// Error message mismatch
- assertEval(Output.ContainsError, "{ bitwOr(c(1,2,3,4), c(3+3i)) }");
+ assertEval(Output.IgnoreErrorContext, "{ bitwOr(c(1,2,3,4), c(3+3i)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftL.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftL.java
index 91e5b5ff4b..6cd42ccb8a 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftL.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftL.java
@@ -28,10 +28,10 @@ public class TestBuiltin_bitwiseShiftL extends TestBase {
assertEval("{ bitwShiftL(c(100,200,300), 1) }");
assertEval("{ bitwShiftL(c(25,57,66), c(10,20,30,40,50,60)) }");
- assertEval(Output.ContainsError, "{ bitwShiftL(TRUE, c(TRUE, FALSE)) }");
+ assertEval(Output.IgnoreErrorContext, "{ bitwShiftL(TRUE, c(TRUE, FALSE)) }");
// Error message mismatch
- assertEval(Ignored.Unknown, Output.ContainsError, "{ bitwShiftL(c(3+3i), c(3,2,4)) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ bitwShiftL(c(3+3i), c(3,2,4)) }");
// Warning message mismatch
assertEval(Ignored.Unknown, "{ bitwShiftL(c(3,2,4), c(3+3i)) }");
// No warning message printed for NAs produced by coercion
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftR.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftR.java
index 0f9449b4ca..dde3268bc5 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseShiftR.java
+++ b/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.ContainsWarning, "{ bitwShiftR(c(3,2,4), c(3+3i)) }");
+ assertEval(Ignored.Unknown, 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\")) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseXor.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseXor.java
index 803297d711..4450756292 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseXor.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_bitwiseXor.java
@@ -28,6 +28,6 @@ public class TestBuiltin_bitwiseXor extends TestBase {
assertEval("{ bitwXor(c(25,57,66), c(10,20,30,40,50,60)) }");
assertEval("{ bitwXor(20,30) }");
- assertEval(Output.ContainsError, "{ bitwXor(c(\"r\"), c(16,17)) }");
+ assertEval(Output.IgnoreErrorContext, "{ bitwXor(c(\"r\"), c(16,17)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cbind.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cbind.java
index deddf2adb0..d6c562f83f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cbind.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_cbind.java
@@ -77,7 +77,7 @@ public class TestBuiltin_cbind extends TestBase {
assertEval("{ cbind(matrix(1:4, nrow=2), z=c(m=8,n=9)) }");
assertEval("{ cbind(list(1,2), TRUE, \"a\") }");
- assertEval(Output.ContainsWarning, "{ cbind(1:3,1:2) }");
+ assertEval(Output.IgnoreWarningContext, "{ cbind(1:3,1:2) }");
assertEval("{ cbind(2,3, complex(3,3,2));}");
assertEval("{ cbind(2,3, c(1,1,1)) }");
assertEval("{ cbind(2.1:10,32.2) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_chol.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_chol.java
index c038f1f5da..e7ca722d15 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_chol.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_chol.java
@@ -29,6 +29,6 @@ public class TestBuiltin_chol extends TestBase {
assertEval("{ chol(1) }");
assertEval("{ round( chol(10), digits=5) }");
assertEval("{ m <- matrix(c(5,1,1,3),2) ; round( chol(m), digits=5 ) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ m <- matrix(c(5,-5,-5,3),2,2) ; chol(m) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ m <- matrix(c(5,-5,-5,3),2,2) ; chol(m) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java
index 2878587ee3..4d2c9af5a1 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_classassign.java
@@ -183,7 +183,7 @@ public class TestBuiltin_classassign extends TestBase {
assertEval("{ x <- function() { }; class(x); class(x)<-c(\"abc\", \"xyz\"); class(x); class(x)<-NULL; class(x) }");
assertEval("{x<-c(1,2,3,4); class(x)<-\"array\"; class(x)<-\"matrix\";}");
- assertEval(Output.ContainsError, "{x<-1;attr(x,\"class\")<-c(1,2,3);}");
+ assertEval(Output.IgnoreErrorContext, "{x<-1;attr(x,\"class\")<-c(1,2,3);}");
assertEval("{ x<-function() 42; class(x)<-\"foo\"; class(x)<-NULL; x }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_col.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_col.java
index 48c52842a0..1be91209a0 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_col.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_col.java
@@ -32,6 +32,6 @@ public class TestBuiltin_col extends TestBase {
assertEval("{ ma <- matrix(1:12, 3, 4) ; col(ma) }");
assertEval("{ ma <- cbind(x = 1:10, y = (-4:5)^2) ; col(ma) }");
- assertEval(Output.ContainsError, "{ col(c(1,2,3)) }");
+ assertEval(Output.IgnoreErrorContext, "{ col(c(1,2,3)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_copyDFattr.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_copyDFattr.java
index ac0290692b..a908bc0199 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_copyDFattr.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_copyDFattr.java
@@ -24,13 +24,13 @@ public class TestBuiltin_copyDFattr extends TestBase {
@Test
public void testcopyDFattr2() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(y = c(2.30923841792462, 3.23011719303818, 2.9161246695212, 3.35931329373059, 5.3777049208621, 5.63518136825043, 7.37725908636056, 7.75621985157329, 10.1175871700049, 8.86877085545769), x1 = 1:10, x2 = 1:10, x3 = c(0.1, 0.4, 0.9, 1.6, 2.5, 3.6, 4.9, 6.4, 8.1, 10)), .Names = c('y', 'x1', 'x2', 'x3'), class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ x1 + x2 + x3)), structure(list(y = NULL, x1 = NULL, x2 = NULL, x3 = NULL), .Names = c('y', 'x1', 'x2', 'x3'), class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ x1 + x2 + x3))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr3() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(y = c(-0.0561287395290008, -0.155795506705329, -1.47075238389927, -0.47815005510862, 0.417941560199702, 1.35867955152904, -0.102787727342996, 0.387671611559369, -0.0538050405829051, -1.37705955682861), x = c(TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE, TRUE, FALSE), z = 1:10), .Names = c('y', 'x', 'z'), class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ x * z)), structure(list(y = NULL, x = NULL, z = NULL), .Names = c('y', 'x', 'z'), class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ x * z))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@@ -41,13 +41,13 @@ public class TestBuiltin_copyDFattr extends TestBase {
@Test
public void testcopyDFattr5() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(A = 0:10, B = 10:20, `NA` = 20:30), .Names = c('A', 'B', NA), row.names = c(NA, -11L), class = 'data.frame'), structure(list(A = NULL, B = NULL, `NA` = NULL), .Names = c('A', 'B', NA), row.names = c(NA, -11L), class = 'data.frame')); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr6() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(`Surv(stop, status * as.numeric(event), type = 'mstate')` = structure(c(760, 2160, 5441, 277, 1815, 2587, 547, 1125, 2010, 2422, 6155, 1767, 61, 60, 7807, 7732, 6126, 7921, 3590, 5231, 5384, 5934, 6415, 6789, 6778, 3561, 4505, 3987, 4726, 5550, 5216, 5757, 2345, 6931, 6760, 5796, 4810, 5143, 3091, 3316, 700, 1706, 5088, 944, 2466, 1706, 7364, 1857, 9510, 9603, 31, 7479, 2006, 2588, 2983, 8761, 3932, 4201, 5293, 273, 2223, 4249, 5308, 8327, 499, 5789, 7417, 3242, 3275, 10359, 10852, 362, 9993, 1795, 3562, 4139, 4840, 4959, 547, 4119, 8308, 1674, 2953, 3776, 1369, 7911, 7519, 9318, 4370, 7301, 1642, 4169, 7417, 6117, 4536, 7235, 6723, 7397, 7428, 2084, 4066, 1673, 2860, 0, 3773, 4810, 4206, 2314, 4065, 8961, 6143, 517, 3837, 7498, 2815, 8806, 7668, 12457, 8600, 7003, 2435, 1826, 2403, 3805, 4901, 365, 6642, 3318, 3012, 1431, 2223, 4962, 5982, 638, 3346, 4996, 6800, 7454, 8887, 5024, 2833, 4232, 5238, 3186, 3380, 3382, 8100, 1766, 7184, 8059, 6008, 5047, 2236, 8165, 4224, 2844, 6256, 7370, 3560, 4939, 4941, 2230, 3068, 152, 10122, 3226, 3943, 518, 8569, 845, 2099, 8006, 8052, 9560, 0, 7965, 7470, 8133, 809, 153, 1851, 3010, 2121, 7085, 5068, 7093, 5930, 6878, 8080, 791, 6626, 3962, 1116, 1249, 9257, 1077, 566, 174, 4627, 5022, 2070, 3012, 1625, 6607, 8381, 8389, 1005, 3895, 4236, 6970, 8497, 2861, 8487, 3227, 8030, 8023, 31, 2435, 518, 4758, 7958, 7884, 4453, 6349, 7862, 1392, 3167, 6025, 4656, 1767, 7736, 2678, 2191, 3658, 7758, 8009, 2556, 3511, 7954, 822, 4321, 5151, 7545, 7576, 32, 7875, 5236, 7106, 2802, 7898, 3014, 7867, 5354, 2989, 7555, 6089, 8697, 6479, 1826, 5917, 792, 1431, 1434, 4763, 2910, 6209, 5824, 2400, 1400, 3027, 7198, 7247, 2557, 3855, 61, 7410, 1492, 7160, 7899, 5181, 7280, 3448, 7381, 2434, 6763, 7065, 1218, 1554, 7533, 7288, 2922, 5988, 2495, 5234, 9598, 2953, 2961, 4539, 3775, 6524, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 2, 0, 2, 1, 2, 2, 0, 2, 1, 2, 0, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 2, 2, 0, 1, 2, 1, 2, 2, 2, 2, 0, 2, 1, 2, 2, 0, 1, 2, 2, 0, 1, 2, 0, 2, 1, 2, 2, 1, 2, 1, 2, 2, 2, 2, 1, 2, 2, 1, 2, 0, 2, 2, 1, 0, 2, 2, 0, 0, 2, 0, 2, 1, 2, 1, 2, 2, 2, 2, 2, 1, 2, 1, 2, 2, 1, 2, 1, 0, 0, 2, 2, 1, 2, 2, 1, 2, 0, 2, 1, 2, 2, 2, 2, 0, 2, 2, 2, 0, 2, 1, 2, 1, 2, 2, 0, 2, 2, 2, 0, 2, 2, 1, 2, 0, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 0, 2, 2, 2, 1, 2, 0, 2, 2, 2, 1, 2, 1, 2, 2, 2, 0, 0, 2, 1, 2, 1, 0, 1, 0, 2, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 0, 2, 2, 2, 2, 2, 0, 2, 1, 2, 0, 0, 1, 2, 0, 2, 1, 2, 1, 2, 2, 0, 1, 2, 1, 0, 2, 0, 2, 2, 0, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 0, 0, 1, 2, 2, 0, 2, 0, 2, 2, 0, 2, 0, 2, 2, 0, 1, 2, 0, 0, 1, 2, 1, 2, 0, 1, 2, 2, 1, 2), .Dim = c(300L, 2L), .Dimnames = list(NULL, c('time', 'status')), type = 'mright', states = c('1', '2'), class = 'Surv')), .Names = 'Surv(stop, status * as.numeric(event), type = \\\'mstate\\\')', class = 'data.frame', row.names = c(NA, 300L)), structure(list(`Surv(stop, status * as.numeric(event), type = 'mstate')` = NULL), .Names = 'Surv(stop, status * as.numeric(event), type = \\\'mstate\\\')', class = 'data.frame', row.names = c(NA, 300L))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@@ -75,13 +75,13 @@ public class TestBuiltin_copyDFattr extends TestBase {
@Test
public void testcopyDFattr11() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(srcfile = c(NA, '/home/lzhao/hg/r-instrumented/library/stats/R/stats', '/home/lzhao/hg/r-instrumented/library/stats/R/stats', '/home/lzhao/hg/r-instrumented/library/stats/R/stats'), frow = c(NA, 2228L, 2369L, 2379L), lrow = c(NA, 2228L, 2369L, 2380L)), .Names = c('srcfile', 'frow', 'lrow'), row.names = c(NA, 4L), class = 'data.frame'), structure(list(srcfile = NULL, frow = NULL, lrow = NULL), .Names = c('srcfile', 'frow', 'lrow'), row.names = c(NA, 4L), class = 'data.frame')); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr12() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(y = c(73, 73, 70, 74, 75, 115, 105, 107, 124, 107, 116, 125, 102, 144, 178, 149, 177, 124, 157, 128, 169, 165, 186, 152, 181, 139, 173, 151, 138, 181, 152, 188, 173, 196, 180, 171, 188, 174, 198, 172, 176, 162, 188, 182, 182, 141, 191, 190, 159, 170, 163, 197), x = c(1, 1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 11, 12)), .Names = c('y', 'x'), class = 'data.frame', row.names = c(NA, 52L), terms = quote(~y + x)), structure(list(y = NULL, x = NULL), .Names = c('y', 'x'), class = 'data.frame', row.names = c(NA, 52L), terms = quote(~y + x))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@@ -93,31 +93,31 @@ public class TestBuiltin_copyDFattr extends TestBase {
@Test
public void testcopyDFattr14() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(y = c(-0.667819876370237, 0.170711734013213, 0.552921941721332, -0.253162069270378, -0.00786394222146348, 0.0246733498130512, 0.0730305465518564, -1.36919169254062, 0.0881443844426084, -0.0834190388782434)), .Names = 'y', class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ 0)), structure(list(y = NULL), .Names = 'y', class = 'data.frame', row.names = c(NA, 10L), terms = quote(y ~ 0))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr15() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(`cbind(w = weight, w2 = weight^2)` = structure(c(4.17, 5.58, 5.18, 6.11, 4.5, 4.61, 5.17, 4.53, 5.33, 5.14, 4.81, 4.17, 4.41, 3.59, 5.87, 3.83, 6.03, 4.89, 4.32, 4.69, 17.3889, 31.1364, 26.8324, 37.3321, 20.25, 21.2521, 26.7289, 20.5209, 28.4089, 26.4196, 23.1361, 17.3889, 19.4481, 12.8881, 34.4569, 14.6689, 36.3609, 23.9121, 18.6624, 21.9961), .Dim = c(20L, 2L), .Dimnames = list(NULL, c('w', 'w2'))), group = structure(c(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L), .Label = c('Ctl', 'Trt'), class = 'factor')), .Names = c('cbind(w = weight, w2 = weight^2)', 'group'), class = 'data.frame', row.names = c(NA, 20L), terms = quote(cbind(w = weight, w2 = weight^2) ~ group)), structure(list(`cbind(w = weight, w2 = weight^2)` = NULL, group = NULL), .Names = c('cbind(w = weight, w2 = weight^2)', 'group'), class = 'data.frame', row.names = c(NA, 20L), terms = quote(cbind(w = weight, w2 = weight^2) ~ group))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr16() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(Y = c(130L, 157L, 174L, 117L, 114L, 161L, 141L, 105L, 140L, 118L, 156L, 61L, 91L, 97L, 100L, 70L, 108L, 126L, 149L, 96L, 124L, 121L, 144L, 68L, 64L, 112L, 86L, 60L, 102L, 89L, 96L, 89L, 129L, 132L, 124L, 74L, 89L, 81L, 122L, 64L, 103L, 132L, 133L, 70L, 89L, 104L, 117L, 62L, 90L, 100L, 116L, 80L, 82L, 94L, 126L, 63L, 70L, 109L, 99L, 53L, 74L, 118L, 113L, 89L, 82L, 86L, 104L, 97L, 99L, 119L, 121L), B = structure(c(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 5L, 6L, 6L, 6L, 6L, 6L, 6L, 6L, 6L, 6L, 6L, 6L, 6L), .Label = c('I', 'II', 'III', 'IV', 'V', 'VI'), class = 'factor'), V = structure(c(3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L), .Label = c('Golden.rain', 'Marvellous', 'Victory'), class = 'factor'), N = structure(c(2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L), .Label = c('0.0cwt', '0.2cwt', '0.4cwt', '0.6cwt'), class = 'factor')), .Names = c('Y', 'B', 'V', 'N'), terms = quote(Y ~ B + V + N + V:N), row.names = 2:72, class = 'data.frame'), structure(list(Y = NULL, B = NULL, V = NULL, N = NULL), .Names = c('Y', 'B', 'V', 'N'), terms = quote(Y ~ B + V + N + V:N), row.names = 2:72, class = 'data.frame')); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr17() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(Fr = c(32, 53, 10, 3, 11, 50, 10, 30, 10, 25, 7, 5, 3, 15, 7, 8, 36, 66, 16, 4, 9, 34, 7, 64, 5, 29, 7, 5, 2, 14, 7, 8), Hair = structure(c(1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L, 1L, 2L, 3L, 4L), .Label = c('Black', 'Brown', 'Red', 'Blond'), class = 'factor'), Eye = structure(c(1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 4L, 4L, 4L, 4L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 4L, 4L, 4L, 4L), .Label = c('Brown', 'Blue', 'Hazel', 'Green'), class = 'factor'), Sex = structure(c(1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L), .Label = c('Male', 'Female'), class = 'factor')), .Names = c('Fr', 'Hair', 'Eye', 'Sex'), class = 'data.frame', row.names = c(NA, 32L), terms = quote(Fr ~ (Hair + Eye + Sex)^2)), structure(list(Fr = NULL, Hair = NULL, Eye = NULL, Sex = NULL), .Names = c('Fr', 'Hair', 'Eye', 'Sex'), class = 'data.frame', row.names = c(NA, 32L), terms = quote(Fr ~ (Hair + Eye + Sex)^2))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@Test
public void testcopyDFattr18() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(Employed = c(60.323, 61.122, 60.171, 61.187, 63.221, 63.639, 64.989, 63.761, 66.019, 67.857, 68.169, 66.513, 68.655, 69.564, 69.331, 70.551), GNP.deflator = c(83, 88.5, 88.2, 89.5, 96.2, 98.1, 99, 100, 101.2, 104.6, 108.4, 110.8, 112.6, 114.2, 115.7, 116.9), GNP = c(234.289, 259.426, 258.054, 284.599, 328.975, 346.999, 365.385, 363.112, 397.469, 419.18, 442.769, 444.546, 482.704, 502.601, 518.173, 554.894), Unemployed = c(235.6, 232.5, 368.2, 335.1, 209.9, 193.2, 187, 357.8, 290.4, 282.2, 293.6, 468.1, 381.3, 393.1, 480.6, 400.7), Armed.Forces = c(159, 145.6, 161.6, 165, 309.9, 359.4, 354.7, 335, 304.8, 285.7, 279.8, 263.7, 255.2, 251.4, 257.2, 282.7), Population = c(107.608, 108.632, 109.773, 110.929, 112.075, 113.27, 115.094, 116.219, 117.388, 118.734, 120.445, 121.95, 123.366, 125.368, 127.852, 130.081), Year = 1947:1962), .Names = c('Employed', 'GNP.deflator', 'GNP', 'Unemployed', 'Armed.Forces', 'Population', 'Year'), class = 'data.frame', row.names = 1947:1962, terms = quote(Employed ~ GNP.deflator + GNP + Unemployed + Armed.Forces + Population + Year)), structure(list(Employed = NULL, GNP.deflator = NULL, GNP = NULL, Unemployed = NULL, Armed.Forces = NULL, Population = NULL, Year = NULL), .Names = c('Employed', 'GNP.deflator', 'GNP', 'Unemployed', 'Armed.Forces', 'Population', 'Year'), class = 'data.frame', row.names = 1947:1962, terms = quote(Employed ~ GNP.deflator + GNP + Unemployed + Armed.Forces + Population + Year))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
@@ -129,7 +129,7 @@ public class TestBuiltin_copyDFattr extends TestBase {
@Test
public void testcopyDFattr20() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(`cbind(X, M)` = structure(c(68, 42, 37, 24, 66, 33, 47, 23, 63, 29, 57, 19, 42, 30, 52, 43, 50, 23, 55, 47, 53, 27, 49, 29), .Dim = c(12L, 2L), .Dimnames = list(NULL, c('X', 'M'))), M.user = structure(c(1L, 1L, 2L, 2L, 1L, 1L, 2L, 2L, 1L, 1L, 2L, 2L), .Label = c('N', 'Y'), class = 'factor'), Temp = structure(c(2L, 1L, 2L, 1L, 2L, 1L, 2L, 1L, 2L, 1L, 2L, 1L), .Label = c('High', 'Low'), class = 'factor'), Soft = structure(c(1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L), .Label = c('Hard', 'Medium', 'Soft'), class = 'factor')), .Names = c('cbind(X, M)', 'M.user', 'Temp', 'Soft'), class = 'data.frame', row.names = c('1', '3', '5', '7', '9', '11', '13', '15', '17', '19', '21', '23'), terms = quote(cbind(X, M) ~ M.user + Temp + Soft)), structure(list(`cbind(X, M)` = NULL, M.user = NULL, Temp = NULL, Soft = NULL), .Names = c('cbind(X, M)', 'M.user', 'Temp', 'Soft'), class = 'data.frame', row.names = c('1', '3', '5', '7', '9', '11', '13', '15', '17', '19', '21', '23'), terms = quote(cbind(X, M) ~ M.user + Temp + Soft))); .Internal(copyDFattr(argv[[1]], argv[[2]]))");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_delayedAssign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_delayedAssign.java
index cc1569f5fa..a7aac98a05 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_delayedAssign.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_delayedAssign.java
@@ -28,9 +28,9 @@ public class TestBuiltin_delayedAssign extends TestBase {
assertEval("{ f <- function() { delayedAssign(\"x\", 3); delayedAssign(\"x\", 2); x } ; f() }");
assertEval("{ f <- function(...) { delayedAssign(\"x\", ..1) ; y <<- x } ; f(10) ; y }");
assertEval("{ f <- function() print (\"outer\"); g <- function() { delayedAssign(\"f\", 1); f() }; g()}");
- assertEval(Output.ContainsError, "{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); g(x, y)}; g <- function(x, y) { x + y }; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); g(x, y)}; g <- function(x, y) { x + y }; f() }");
assertEval("{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); list(x, y)}; f() }");
- assertEval(Output.ContainsError, "{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); paste(x, y)}; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); paste(x, y)}; f() }");
assertEval("{ f <- function() { delayedAssign(\"x\",y); delayedAssign(\"y\",x); print(x, y)}; f() }");
assertEval("{ f <- function() { p <- 0; for (i in 1:10) { if (i %% 2 == 0) { delayedAssign(\"a\", p + 1); } else { a <- p + 1; }; p <- a; }; p }; f() }");
assertEval("{ f <- function() { x <- 4 ; delayedAssign(\"x\", y); y <- 10; x } ; f() }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dfltWarn.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dfltWarn.java
index a0d196be1d..5467dcff06 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dfltWarn.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dfltWarn.java
@@ -24,7 +24,7 @@ public class TestBuiltin_dfltWarn extends TestBase {
@Test
public void testdfltWarn2() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list('bessel_y(2,nu=288.12): precision lost in result', quote(besselY(2, nu = nu <- seq(3, 300, len = 51)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@@ -46,7 +46,7 @@ public class TestBuiltin_dfltWarn extends TestBase {
@Test
public void testdfltWarn6() {
- assertEval(Output.ContainsWarning, "argv <- list('NaNs produced', quote(log(ifelse(y == 0, 1, y/mu)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
+ assertEval(Output.IgnoreWarningContext, "argv <- list('NaNs produced', quote(log(ifelse(y == 0, 1, y/mu)))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
@@ -56,13 +56,13 @@ public class TestBuiltin_dfltWarn extends TestBase {
@Test
public void testdfltWarn8() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list('prediction from a rank-deficient fit may be misleading', quote(predict.lm(object, newdata, se.fit, scale = residual.scale, type = ifelse(type == 'link', 'response', type), terms = terms, na.action = na.action))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
public void testdfltWarn9() {
- assertEval(Output.ContainsWarning, "argv <- list('1 y value <= 0 omitted from logarithmic plot', quote(xy.coords(x, NULL, log = log))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
+ assertEval(Output.IgnoreWarningContext, "argv <- list('1 y value <= 0 omitted from logarithmic plot', quote(xy.coords(x, NULL, log = log))); .Internal(.dfltWarn(argv[[1]], argv[[2]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_digamma.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_digamma.java
index c315275dc4..c2556e91b4 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_digamma.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_digamma.java
@@ -53,6 +53,6 @@ public class TestBuiltin_digamma extends TestBase {
assertEval("{ digamma(c(100, 2.2)) }");
assertEval("{ digamma(FALSE) }");
assertEval("{ digamma(as.raw(1)) }");
- assertEval(Output.ContainsError, "{ digamma(1+1i) }");
+ assertEval(Output.IgnoreErrorContext, "{ digamma(1+1i) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dim.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dim.java
index 4b2dd8c86d..b18378be45 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dim.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_dim.java
@@ -186,7 +186,7 @@ public class TestBuiltin_dim extends TestBase {
assertEval("{ x <- 1:4 ; f <- function() { x <- 1:4 ; dim(x) <<- c(2,2) } ; f() ; dim(x) }");
assertEval("{ x<-1:12; dim(x)<-c(12); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:12; dim(x)<-c(12+10i); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:12; dim(x)<-c(12+10i); x }");
assertEval("{ x<-1:12; dim(x)<-c(as.raw(12)); x }");
assertEval("{ x<-1:12; dim(x)<-c(\"12\"); x }");
assertEval("{ x<-1:1; dim(x)<-c(TRUE); x }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_docall.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_docall.java
index c192ecb62d..7f13a13bc2 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_docall.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_docall.java
@@ -24,8 +24,8 @@ public class TestBuiltin_docall extends TestBase {
assertEval("{ do.call(quote, list(quote(1)))}");
assertEval("{ do.call(quote, list(quote(x)))}");
assertEval("{ do.call(quote, list(quote(x+1)))}");
- assertEval(Output.ContainsError, "{ f <- function(x) x; do.call(f, list(quote(y)))}");
- assertEval(Output.ContainsError, "{ f <- function(x) x; do.call(f, list(quote(y + 1)))}");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) x; do.call(f, list(quote(y)))}");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) x; do.call(f, list(quote(y + 1)))}");
assertEval("{ do.call(\"+\", list(quote(1), 2))}");
assertEval("v1 <- as.numeric_version('3.0.0'); v2 <- as.numeric_version('3.1.0'); do.call('<', list(v1, v2))");
assertEval("v1 <- as.numeric_version('3.0.0'); v2 <- as.numeric_version('3.1.0'); do.call('<', list(quote(v1), quote(v2)))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_duplicated.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_duplicated.java
index eabf969225..f2a56bb642 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_duplicated.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_duplicated.java
@@ -126,8 +126,8 @@ public class TestBuiltin_duplicated extends TestBase {
assertEval("{ duplicated(c(1+1i, 4-6i, 4-6i, 6+7i)) }");
assertEval("{ duplicated(c(1, 4+6i, 7+7i, 1), incomparables = c(1, 2)) }");
- assertEval(Output.ContainsWarning, "{ duplicated(c(1L, 2L, 1L, 1L, 3L, 2L), incomparables = \"cat\") }");
- assertEval(Output.ContainsWarning, "{ duplicated(c(1,2,3,2), incomparables = c(2+6i)) }");
+ assertEval(Output.IgnoreWarningContext, "{ duplicated(c(1L, 2L, 1L, 1L, 3L, 2L), incomparables = \"cat\") }");
+ assertEval(Output.IgnoreWarningContext, "{ duplicated(c(1,2,3,2), incomparables = c(2+6i)) }");
assertEval("{ duplicated(NULL, 0); }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_extract_dataframe.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_extract_dataframe.java
index 6a8abe4646..306597da00 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_extract_dataframe.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_extract_dataframe.java
@@ -46,7 +46,7 @@ public class TestBuiltin_extract_dataframe extends TestBase {
@Test
public void undefinedColumnGivesError() {
- assertEval(Output.ContainsError, "mtcars[42]");
+ assertEval(Output.IgnoreErrorContext, "mtcars[42]");
}
@Test
@@ -60,6 +60,6 @@ public class TestBuiltin_extract_dataframe extends TestBase {
assertEval("{ fr <- data.frame(1:3,4:6); attr(fr,'names') <- NULL; fr[1,2] }");
// N.B.: this warning is surprisingly formatted with extra new line before the contents of
// warning(...) invoked from R code
- assertEval(Output.ContainsWarning, "{ fr <- data.frame(1:3,4:6); attr(fr,'names') <- NULL; fr['col'] }");
+ assertEval(Output.IgnoreWarningContext, "{ fr <- data.frame(1:3,4:6); attr(fr,'names') <- NULL; fr['col'] }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_factor.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_factor.java
index 5ac8a494c8..be1ae240ee 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_factor.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_factor.java
@@ -38,15 +38,15 @@ public class TestBuiltin_factor extends TestBase {
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-NULL; as.character(x) }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-character(); as.character(x) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3); class(x)<-\"factor\"; x }");
- assertEval(Output.ContainsError, "{ x<-c(\"1\",\"2\",\"3\"); class(x)<-\"factor\"; x }");
- assertEval(Output.ContainsError, "{ x<-c(1L,2L,3L); class(x)<-\"factor\"; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3); class(x)<-\"factor\"; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(\"1\",\"2\",\"3\"); class(x)<-\"factor\"; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1L,2L,3L); class(x)<-\"factor\"; x }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(7L, 42L); x }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(7, 42); x }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(FALSE, TRUE); x }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(7+7i, 42+42i); x }");
- assertEval(Output.ContainsError, "{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(as.raw(7), as.raw(42)); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(as.raw(7), as.raw(42)); x }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); x == \"a\" }");
// these would fail if comparison was performed on strings
@@ -55,15 +55,15 @@ public class TestBuiltin_factor extends TestBase {
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(+7+7i, +42+42i); x == 7+7i }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); attr(x, \"levels\")<-c(as.raw(7), as.raw(42)); x == as.raw(7) }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\")); x == c(\"a\", \"b\") }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); x == c(\"a\", \"b\") }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\", \"c\")); x == c(\"a\", \"b\") }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\"), ordered=TRUE); x > \"a\" }");
assertEval("{ x<-c(1L, 2L, 1L); class(x)<-c(\"ordered\", \"factor\"); levels(x)<-c(\"a\", \"b\"); x > \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-list(1); y[1]<-x; y }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-c(1); y[1]<-x; y }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-list(1); y[1]<-x; y }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-c(1); y[1]<-x; y }");
assertEval("{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-list(1); y[[1]]<-x; y }");
assertEval("{ x<-factor(c(\"c\", \"b\", \"a\", \"c\")); y<-c(1); y[[1]]<-x; y }");
@@ -102,16 +102,16 @@ public class TestBuiltin_factor extends TestBase {
assertEval("{ x<-structure(c(1,2,1), .Label=c(\"a\", \"b\"), class = c('factor'), .Names=c(\"111\",\"112\",\"113\")); names(x) }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\"), ordered=TRUE); x + \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"ordered\", \"factor\"); levels(x)<-c(\"a\", \"b\"); x + \"a\" }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\"), ordered=TRUE); x + \"a\" }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"ordered\", \"factor\"); levels(x)<-c(\"a\", \"b\"); x + \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\")); x > \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\")); x + \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\")); x > c(\"a\", \"b\") }");
- assertEval(Output.ContainsWarning, "{ x<-factor(c(\"a\", \"b\", \"a\")); x + c(\"a\", \"b\") }");
- assertEval(Output.ContainsWarning, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"factor\", \"ordered\"); levels(x)<-c(\"a\", \"b\"); x > \"a\" }");
- assertEval(Output.ContainsWarning, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"factor\", \"ordered\"); levels(x)<-c(\"a\", \"b\"); x + \"a\" }");
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); x > \"a\" }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); x + \"a\" }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); x > c(\"a\", \"b\") }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-factor(c(\"a\", \"b\", \"a\")); x + c(\"a\", \"b\") }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"factor\", \"ordered\"); levels(x)<-c(\"a\", \"b\"); x > \"a\" }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-c(1L, 2L, 1L); class(x)<-c(\"factor\", \"ordered\"); levels(x)<-c(\"a\", \"b\"); x + \"a\" }");
+ assertEval(Output.IgnoreWarningContext,
"{ x<-structure(c(1,2,1), .Label=c(\"a\", \"b\"), class = c('factor'), .Names=c(\"111\",\"112\",\"113\")); y<-structure(c(1,2,1), .Label=c(\"a\", \"b\"), class = c('factor'), .Names=c(\"111\",\"112\",\"113\")); x+y }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_get.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_get.java
index 3d581bf29e..6b175baaff 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_get.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_get.java
@@ -24,11 +24,11 @@ public class TestBuiltin_get extends TestBase {
assertEval("{y<-function(){y<-2;get(\"y\",mode=\"integer\",inherits=FALSE);get(\"y\",mode=\"integer\",inherits=FALSE)};y();}");
assertEval("{y<-function(){y<-2;get(\"y\",mode=\"double\")};y();}");
assertEval("{y<-function(){y<-2;get(\"y\",mode=\"double\",inherits=FALSE)};y();}");
- assertEval(Output.ContainsError, "{ get(\"dummy\") }");
- assertEval(Output.ContainsError, "{ x <- 33 ; f <- function() { if (FALSE) { x <- 22 } ; get(\"x\", inherits = FALSE) } ; f() }");
- assertEval(Output.ContainsError, "{ x <- 33 ; f <- function() { get(\"x\", inherits = FALSE) } ; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ get(\"dummy\") }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- 33 ; f <- function() { if (FALSE) { x <- 22 } ; get(\"x\", inherits = FALSE) } ; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- 33 ; f <- function() { get(\"x\", inherits = FALSE) } ; f() }");
assertEval("{ get(\".Platform\", globalenv())$endian }");
assertEval("{ get(\".Platform\")$endian }");
- assertEval(Output.ContainsError, "{y<-function(){y<-2;get(\"y\",mode=\"closure\",inherits=FALSE);};y();}");
+ assertEval(Output.IgnoreErrorContext, "{y<-function(){y<-2;get(\"y\",mode=\"closure\",inherits=FALSE);};y();}");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_grep.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_grep.java
index 921074549b..c68b2c44c4 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_grep.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_grep.java
@@ -50,7 +50,7 @@ public class TestBuiltin_grep extends TestBase {
@Test
public void testgrep7() {
assertEval(Ignored.ParserErrorFormatting,
- Output.ContainsError,
+ Output.IgnoreErrorContext,
"argv <- list(''', structure('exNSS4_1.0.tar.gz', .Names = ''), FALSE, FALSE, FALSE, FALSE, FALSE, FALSE); .Internal(grep(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]], argv[[8]]))");
assertEval("argv <- list('\\'', structure('exNSS4_1.0.tar.gz', .Names = ''), FALSE, FALSE, FALSE, FALSE, FALSE, FALSE); .Internal(grep(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]], argv[[8]]))");
assertEval("argv <- list('', structure('exNSS4_1.0.tar.gz', .Names = ''), FALSE, FALSE, FALSE, FALSE, FALSE, FALSE); .Internal(grep(argv[[1]], argv[[2]], argv[[3]], argv[[4]], argv[[5]], argv[[6]], argv[[7]], argv[[8]]))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java
index 19138f4e0a..74b77a503b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_gsub.java
@@ -175,7 +175,7 @@ public class TestBuiltin_gsub extends TestBase {
assertEval("{ gsub(\"a\",\"aa\", \"prAgue alley\") }");
assertEval("{ gsub(\"a\",\"aa\", \"prague alley\", fixed=TRUE) }");
assertEval("{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE) }");
- assertEval(Output.ContainsWarning, "{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE, ignore.case=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ gsub(\"a\",\"aa\", \"prAgue alley\", fixed=TRUE, ignore.case=TRUE) }");
assertEval("{ gsub(\"([a-e])\",\"\\\\1\\\\1\", \"prague alley\") }");
assertEval("{ gsub(\"h\",\"\", c(\"hello\", \"hi\", \"bye\")) }");
assertEval("{ gsub(\"h\",\"\", c(\"hello\", \"hi\", \"bye\"), fixed=TRUE) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java
index 20c692ee5f..f913795f49 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_intToBits.java
@@ -38,18 +38,18 @@ public class TestBuiltin_intToBits extends TestBase {
assertEval("intToBits(-1.56)");
assertEval("intToBits(-0.3)");
assertEval("intToBits('123')");
- assertEval(Output.ContainsWarning, "intToBits(5+7i)");
+ assertEval(Output.IgnoreWarningContext, "intToBits(5+7i)");
assertEval("intToBits(NULL)");
assertEval("intToBits(c(1,2,3))");
assertEval("intToBits(c(5L,99L))");
assertEval("intToBits(integer(0))");
assertEval("intToBits(double(0))");
assertEval("intToBits(6:9)");
- assertEval(Output.ContainsWarning, "intToBits('23rrff')");
+ assertEval(Output.IgnoreWarningContext, "intToBits('23rrff')");
assertEval("intToBits(new.env())");
assertEval("intToBits(environment)");
assertEval(Ignored.ImplementationError, "intToBits(stdout())");
- assertEval(Output.ContainsError, "intToBits(list(c(5,5,7,8),88,6L))");
+ assertEval(Output.IgnoreErrorContext, "intToBits(list(c(5,5,7,8),88,6L))");
assertEval("intToBits(list(5,5,7,8))");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_invisible.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_invisible.java
index 6fb597ed7f..f25adfe755 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_invisible.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_invisible.java
@@ -24,7 +24,7 @@ public class TestBuiltin_invisible extends TestBase {
@Test
public void testinvisible2() {
- assertEval(Output.ContainsError,
+ assertEval(Output.IgnoreErrorContext,
"argv <- list(structure('Error in cov(rnorm(10), NULL) : \\n supply both 'x' and 'y' or a matrix-like 'x'\\n', class = 'try-error', condition = structure(list(message = 'supply both 'x' and 'y' or a matrix-like 'x'', call = quote(cov(rnorm(10), NULL))), .Names = c('message', 'call'), class = c('simpleError', 'error', 'condition'))));invisible(argv[[1]]);");
}
@@ -96,7 +96,7 @@ public class TestBuiltin_invisible extends TestBase {
@Test
public void testinvisible16() {
- assertEval(Output.ContainsError,
+ assertEval(Output.IgnoreErrorContext,
"argv <- list(structure('Error in cor(Z[, FALSE], use = \\\'pairwise.complete.obs\\\', method = \\\'kendall\\\') : \\n 'x' is empty\\n', class = 'try-error', condition = structure(list(message = \''x' is empty', call = quote(cor(Z[, FALSE], use = 'pairwise.complete.obs', method = 'kendall'))), .Names = c('message', 'call'), class = c('simpleError', 'error', 'condition'))));invisible(argv[[1]]);");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isfactor.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isfactor.java
index e1a44ee662..d4579d558c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isfactor.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isfactor.java
@@ -30,6 +30,6 @@ public class TestBuiltin_isfactor extends TestBase {
assertEval("{is.factor(1)}");
assertEval("{is.factor(c)}");
- assertEval(Output.ContainsError, "{x<-1;class(x)<-\"factor\";is.factor(x)}");
+ assertEval(Output.IgnoreErrorContext, "{x<-1;class(x)<-\"factor\";is.factor(x)}");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_islistfactor.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_islistfactor.java
index fae4074d24..92ab4c440a 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_islistfactor.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_islistfactor.java
@@ -74,7 +74,7 @@ public class TestBuiltin_islistfactor extends TestBase {
@Test
public void testislistfactor12() {
- assertEval(Output.ContainsAmbiguousError,
+ assertEval(Output.IgnoreErrorMessage,
"argv <- list(structure(list(event = c('Min. : 1.00 ', '1st Qu.: 9.00 ', 'Median :18.00 ', 'Mean :14.74 ', '3rd Qu.:20.00 ', 'Max. :23.00 ', NA), mag = c('Min. :5.000 ', '1st Qu.:5.300 ', 'Median :6.100 ', 'Mean :6.084 ', '3rd Qu.:6.600 ', 'Max. :7.700 ', NA), station = c('117 : 5 ', '1028 : 4 ', '113 : 4 ', '112 : 3 ', '135 : 3 ', '(Other):147 ', 'NA's : 16 '), dist = c('Min. : 0.50 ', '1st Qu.: 11.32 ', 'Median : 23.40 ', 'Mean : 45.60 ', '3rd Qu.: 47.55 ', 'Max. :370.00 ', NA), accel = c('Min. :0.00300 ', '1st Qu.:0.04425 ', 'Median :0.11300 ', 'Mean :0.15422 ', '3rd Qu.:0.21925 ', 'Max. :0.81000 ', NA)), .Names = c('event', 'mag', 'station', 'dist', 'accel')), TRUE); .Internal(islistfactor(argv[[1]], argv[[2]]))");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
index 3421794726..4fa4917ba8 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_isna.java
@@ -152,7 +152,7 @@ public class TestBuiltin_isna extends TestBase {
@Test
public void testisna29() {
- assertEval(Output.ContainsWarning, "argv <- list(NULL);is.na(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(NULL);is.na(argv[[1]]);");
}
@Test
@@ -253,7 +253,7 @@ public class TestBuiltin_isna extends TestBase {
assertEval("{ is.na(1[10]) }");
assertEval("{ is.na(c(1[10],2[10],3)) }");
assertEval("{ is.na(list(1[10],1L[10],list(),integer())) }");
- assertEval(Output.ContainsWarning, "is.na(quote(x()))");
+ assertEval(Output.IgnoreWarningContext, "is.na(quote(x()))");
assertEval("is.na(is.na))");
// Note: is.na.data.frame calls do.call("cbind", lapply(x, "is.na")) - there is the error
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_lgamma.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_lgamma.java
index 986f76030b..7cfe89a93f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_lgamma.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_lgamma.java
@@ -56,7 +56,7 @@ public class TestBuiltin_lgamma extends TestBase {
@Test
public void testlgamma9() {
- assertEval(Output.ContainsWarning, "argv <- list(Inf);do.call('lgamma', argv)");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(Inf);do.call('lgamma', argv)");
}
@Test
@@ -68,6 +68,6 @@ public class TestBuiltin_lgamma extends TestBase {
assertEval("{ lgamma(c(100, 2.2)) }");
assertEval("{ lgamma(FALSE) }");
assertEval("{ lgamma(as.raw(1)) }");
- assertEval(Output.ContainsError, "{ lgamma(1+1i) }");
+ assertEval(Output.IgnoreErrorContext, "{ lgamma(1+1i) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makenames.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makenames.java
index 3166df8203..4bdd7f1b7c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makenames.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makenames.java
@@ -89,8 +89,8 @@ public class TestBuiltin_makenames extends TestBase {
assertEval("{ make.names(\"else\")}");
assertEval("{ make.names(\"NA_integer_\", allow_=FALSE) }");
- assertEval(Output.ContainsError, "{ make.names(\"a_a\", allow_=\"a\") }");
- assertEval(Output.ContainsError, "{ make.names(\"a_a\", allow_=logical()) }");
- assertEval(Output.ContainsError, "{ make.names(\"a_a\", allow_=NULL) }");
+ assertEval(Output.IgnoreErrorContext, "{ make.names(\"a_a\", allow_=\"a\") }");
+ assertEval(Output.IgnoreErrorContext, "{ make.names(\"a_a\", allow_=logical()) }");
+ assertEval(Output.IgnoreErrorContext, "{ make.names(\"a_a\", allow_=NULL) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makeunique.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makeunique.java
index fd5123c4fb..b6a376df3d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makeunique.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_makeunique.java
@@ -44,8 +44,8 @@ public class TestBuiltin_makeunique extends TestBase {
assertEval("{ make.unique(c(\"a\", \"a\")) }");
assertEval("{ make.unique(c(\"a\", \"a\", \"a\")) }");
assertEval("{ make.unique(c(\"a\", \"a\"), \"_\") }");
- assertEval(Output.ContainsError, "{ make.unique(1) }");
- assertEval(Output.ContainsError, "{ make.unique(\"a\", 1) }");
- assertEval(Output.ContainsError, "{ make.unique(\"a\", character()) }");
+ assertEval(Output.IgnoreErrorContext, "{ make.unique(1) }");
+ assertEval(Output.IgnoreErrorContext, "{ make.unique(\"a\", 1) }");
+ assertEval(Output.IgnoreErrorContext, "{ make.unique(\"a\", character()) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_matchfun.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_matchfun.java
index 8d17fac1a3..c18152dc17 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_matchfun.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_matchfun.java
@@ -65,9 +65,9 @@ public class TestBuiltin_matchfun extends TestBase {
assertEval("min <- 1; f <- function(min) { match.fun(min, descend=T)}; f(min)");
assertEval("min <- 1; f <- function(min) { match.fun(min, descend=F)}; f(min)");
- assertEval(Output.ContainsError, "min <- 1; f <- function(min) { match.fun(min)}; f(baz)");
- assertEval(Output.ContainsError, "min <- 1; f <- function(min) { match.fun(min, descend=T)}; f(baz)");
- assertEval(Output.ContainsError, "min <- 1; f <- function(min) { match.fun(min, descend=F)}; f(baz)");
+ assertEval(Output.IgnoreErrorContext, "min <- 1; f <- function(min) { match.fun(min)}; f(baz)");
+ assertEval(Output.IgnoreErrorContext, "min <- 1; f <- function(min) { match.fun(min, descend=T)}; f(baz)");
+ assertEval(Output.IgnoreErrorContext, "min <- 1; f <- function(min) { match.fun(min, descend=F)}; f(baz)");
assertEval("min <- 1; f <- function(x) { match.fun(x)}; f(c('min'))");
assertEval("min <- 1; f <- function(x) { match.fun(x)}; f(c('min', 'max'))");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
index d8bb8bd25e..d1cd0ce9a3 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
@@ -59,7 +59,7 @@ public class TestBuiltin_max extends TestBase {
@Test
public void testmax9() {
- assertEval(Output.ContainsError,
+ assertEval(Output.IgnoreErrorContext,
"argv <- list(structure(list(x = c(-1, 1, 1, -1, -1, 1, 1, -1), y = c(-0.701149425287356, -0.701149425287356, -0.701149425287356, -0.701149425287356, 0.701149425287356, 0.701149425287356, 0.701149425287356, 0.701149425287356), z = c(-0.4, -0.4, 0.4, 0.4, -0.4, -0.4, 0.4, 0.4)), .Names = c('x', 'y', 'z'), row.names = c(NA, -8L), class = 'data.frame'), na.rm = FALSE);max(argv[[1]],argv[[2]]);");
}
@@ -100,7 +100,7 @@ public class TestBuiltin_max extends TestBase {
@Test
public void testmax17() {
- assertEval(Output.ContainsError, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);max(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreErrorContext, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);max(argv[[1]],argv[[2]]);");
}
@Test
@@ -181,17 +181,17 @@ public class TestBuiltin_max extends TestBase {
assertEval("{ is.logical(max(TRUE, FALSE)) }");
assertEval("{ is.logical(max(TRUE)) }");
assertEval("{ max(as.raw(42), as.raw(7)) }");
- assertEval(Output.ContainsError, "{ max(42+42i, 7+7i) }");
+ assertEval(Output.IgnoreErrorContext, "{ max(42+42i, 7+7i) }");
assertEval("{ max(\"42\", \"7\") }");
assertEval("{ max(as.double(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ max(as.double(NA), as.double(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ max(as.double(NA), as.double(NA), na.rm=TRUE) }");
assertEval("{ max(as.double(NA), as.double(NA), na.rm=FALSE) }");
assertEval("{ max(as.integer(NA), na.rm=FALSE) }");
assertEval("{ max(as.integer(NA), as.integer(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ max(as.character(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ max(as.character(NA), na.rm=TRUE) }");
assertEval("{ max(as.character(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ max(as.character(NA), as.character(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ max(as.character(NA), as.character(NA), na.rm=TRUE) }");
assertEval("{ max(as.character(NA), as.character(NA), na.rm=FALSE) }");
assertEval("{ max(42L, as.integer(NA), na.rm=TRUE) }");
assertEval("{ max(42L, as.integer(NA), na.rm=FALSE) }");
@@ -215,10 +215,10 @@ public class TestBuiltin_max extends TestBase {
assertEval("max(v<-42)");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ max(integer(0)) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ max(integer()) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ max(as.double(NA), na.rm=TRUE) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ max(as.integer(NA), na.rm=TRUE) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ max(as.integer(NA), as.integer(NA), na.rm=TRUE) }");
+ 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(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) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_mean.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_mean.java
index 6f9abb2eba..a083740070 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_mean.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_mean.java
@@ -119,7 +119,7 @@ public class TestBuiltin_mean extends TestBase {
@Test
public void testmean22() {
- assertEval(Output.ContainsWarning, "argv <- structure(list(x = structure(c(2L, 1L, 2L, 2L), .Label = c('FALSE', 'TRUE'), class = 'factor')), .Names = 'x');do.call('mean', argv)");
+ assertEval(Output.IgnoreWarningContext, "argv <- structure(list(x = structure(c(2L, 1L, 2L, 2L), .Label = c('FALSE', 'TRUE'), class = 'factor')), .Names = 'x');do.call('mean', argv)");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_meandefault.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_meandefault.java
index 398254087d..41ce2131cd 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_meandefault.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_meandefault.java
@@ -20,6 +20,6 @@ public class TestBuiltin_meandefault extends TestBase {
@Test
public void testmeandefault1() {
- assertEval(Output.ContainsWarning, "argv <- structure(list(x = structure(c(2L, 1L, 2L, 2L), .Label = c('FALSE', 'TRUE'), class = 'factor')), .Names = 'x');do.call('mean.default', argv)");
+ assertEval(Output.IgnoreWarningContext, "argv <- structure(list(x = structure(c(2L, 1L, 2L, 2L), .Label = c('FALSE', 'TRUE'), class = 'factor')), .Names = 'x');do.call('mean.default', argv)");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_min.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_min.java
index bf2ca04572..55338bf8ec 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_min.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_min.java
@@ -54,7 +54,7 @@ public class TestBuiltin_min extends TestBase {
@Test
public void testmin8() {
- assertEval(Output.ContainsError, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);min(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreErrorContext, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);min(argv[[1]],argv[[2]]);");
}
@Test
@@ -148,17 +148,17 @@ public class TestBuiltin_min extends TestBase {
assertEval("{ is.logical(min(TRUE, FALSE)) }");
assertEval("{ is.logical(min(TRUE)) }");
assertEval("{ min(as.raw(42), as.raw(7)) }");
- assertEval(Output.ContainsError, "{ min(42+42i, 7+7i) }");
+ assertEval(Output.IgnoreErrorContext, "{ min(42+42i, 7+7i) }");
assertEval("{ min(\"42\", \"7\") }");
assertEval("{ min(as.double(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ min(as.double(NA), as.double(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ min(as.double(NA), as.double(NA), na.rm=TRUE) }");
assertEval("{ min(as.double(NA), as.double(NA), na.rm=FALSE) }");
assertEval("{ min(as.integer(NA), na.rm=FALSE) }");
assertEval("{ min(as.integer(NA), as.integer(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ min(as.character(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ min(as.character(NA), na.rm=TRUE) }");
assertEval("{ min(as.character(NA), na.rm=FALSE) }");
- assertEval(Output.ContainsWarning, "{ min(as.character(NA), as.character(NA), na.rm=TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ min(as.character(NA), as.character(NA), na.rm=TRUE) }");
assertEval("{ min(as.character(NA), as.character(NA), na.rm=FALSE) }");
assertEval("{ min(42L, as.integer(NA), na.rm=TRUE) }");
assertEval("{ min(42L, as.integer(NA), na.rm=FALSE) }");
@@ -173,10 +173,10 @@ public class TestBuiltin_min extends TestBase {
assertEval("{ min(\"42\", as.character(NA), \"7\", na.rm=TRUE) }");
assertEval("{ min(\"42\", as.character(NA), \"7\", na.rm=FALSE) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ min(integer(0)) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ min(integer()) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ min(as.double(NA), na.rm=TRUE) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ min(as.integer(NA), na.rm=TRUE) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ min(as.integer(NA), as.integer(NA), na.rm=TRUE) }");
+ 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(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) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_namesassign.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_namesassign.java
index baac57d309..b34f102723 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_namesassign.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_namesassign.java
@@ -112,8 +112,8 @@ public class TestBuiltin_namesassign extends TestBase {
assertEval("{ x<-c(1, 2); names(x)<-c(\"a\", \"b\"); attr(x, \"names\")<-NULL; x }");
assertEval("{ x<-c(1, 2); names(x)<-42; x }");
assertEval("{ x<-c(1, 2); names(x)<-c(TRUE, FALSE); x }");
- assertEval(Output.ContainsError, "{ x<-c(1,2); names(x) <- 42:44; x }");
- assertEval(Output.ContainsError, "{ x<-c(1,2); attr(x, \"names\") <- 42:45; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2); names(x) <- 42:44; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2); attr(x, \"names\") <- 42:45; x }");
assertEval("{ x<-list(1,2); names(x)<-c(\"a\",NA); x }");
assertEval("{ x<-list(1,2); names(x)<-c(\"a\",\"$\"); x }");
assertEval("{ x<-list(1,2); names(x)<-c(\"a\",\"b\"); x }");
@@ -137,7 +137,7 @@ public class TestBuiltin_namesassign extends TestBase {
assertEval("{ x <- c(1,2); names(x) <- c(\"A\", \"B\") ; x + 1 }");
assertEval("{ x <- 1:2; names(x) <- c(\"A\", \"B\") ; y <- c(1,2,3,4) ; names(y) <- c(\"X\", \"Y\", \"Z\") ; x + y }");
- assertEval(Output.ContainsError, "{ x <- quote(plot(x = age, y = weight)); names(x)<- c(\"\", \"a\", \"b\", \"d\")}");
+ assertEval(Output.IgnoreErrorContext, "{ x <- quote(plot(x = age, y = weight)); names(x)<- c(\"\", \"a\", \"b\", \"d\")}");
assertEval("{ x <- quote(plot(x = age, y = weight)); names(x)<- c(\"\", \"a\", \"b\"); x}");
assertEval("{ x <- quote(plot(x = age, y = weight)); x$x <- \"random\"; x}");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ngettext.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ngettext.java
index a28b99d435..cc92051e78 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ngettext.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_ngettext.java
@@ -36,14 +36,14 @@ public class TestBuiltin_ngettext extends TestBase {
assertEval("{ ngettext(1, \"a\", c(\"b\")) }");
assertEval("{ ngettext(c(1), \"a\", \"b\") }");
assertEval("{ ngettext(c(1,2), \"a\", \"b\") }");
- assertEval(Output.ContainsWarning, "{ ngettext(1+1i, \"a\", \"b\") }");
- assertEval(Output.ContainsError, "{ ngettext(1, NULL, \"b\") }");
- assertEval(Output.ContainsError, "{ ngettext(1, \"a\", NULL) }");
- assertEval(Output.ContainsError, "{ ngettext(1, NULL, NULL) }");
- assertEval(Output.ContainsError, "{ ngettext(1, c(\"a\", \"c\"), \"b\") }");
- assertEval(Output.ContainsError, "{ ngettext(1, \"a\", c(\"b\", \"c\")) }");
- assertEval(Output.ContainsError, "{ ngettext(1, c(1), \"b\") }");
- assertEval(Output.ContainsError, "{ ngettext(1, \"a\", c(1)) }");
- assertEval(Output.ContainsError, "{ ngettext(-1, \"a\", \"b\") }");
+ assertEval(Output.IgnoreWarningContext, "{ ngettext(1+1i, \"a\", \"b\") }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, NULL, \"b\") }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, \"a\", NULL) }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, NULL, NULL) }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, c(\"a\", \"c\"), \"b\") }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, \"a\", c(\"b\", \"c\")) }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, c(1), \"b\") }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(1, \"a\", c(1)) }");
+ assertEval(Output.IgnoreErrorContext, "{ ngettext(-1, \"a\", \"b\") }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_normalizePath.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_normalizePath.java
index 29c799293a..8fd4bbb849 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_normalizePath.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_normalizePath.java
@@ -19,7 +19,7 @@ public class TestBuiltin_normalizePath extends TestBase {
@Test
public void testnormalizePath1() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(c('/home/lzhao/hg/r-instrumented/library', '/home/lzhao/R/x86_64-unknown-linux-gnu-library/3.0', '/home/lzhao/hg/r-instrumented/library'), '/', NA); .Internal(normalizePath(argv[[1]], argv[[2]], argv[[3]]))");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
index 0e8a7c0173..b4c71cde11 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_operators.java
@@ -34,13 +34,13 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators4() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`*`(argv[[1]],argv[[2]]);");
}
@Test
public void testoperators5() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`*`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`*`(argv[[1]]);");
}
@Test
@@ -183,12 +183,12 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators33() {
- assertEval(Output.ContainsWarning, "argv <- list(c(20.8, 11.2, 6.2, 12.8, 43.4), c(10.4, 5.6, 3.1, 6.4, 21.7, 0, 10.4, 5.6, 3.1, 6.4, 21.7));`+`(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(c(20.8, 11.2, 6.2, 12.8, 43.4), c(10.4, 5.6, 3.1, 6.4, 21.7, 0, 10.4, 5.6, 3.1, 6.4, 21.7));`+`(argv[[1]],argv[[2]]);");
}
@Test
public void testoperators34() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`+`(argv[[1]],argv[[2]]);");
}
@@ -199,7 +199,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators36() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`+`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`+`(argv[[1]]);");
}
@Test
@@ -311,7 +311,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators58() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 1L);`-`(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 1L);`-`(argv[[1]],argv[[2]]);");
}
@Test
@@ -341,7 +341,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators64() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`-`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`-`(argv[[1]]);");
}
@Test
@@ -366,7 +366,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators69() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`-`(argv[[1]],argv[[2]]);");
}
@@ -438,7 +438,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators84() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`<`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`<`(argv[[1]]);");
}
@Test
@@ -448,7 +448,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators86() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 1L);`<`(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 1L);`<`(argv[[1]],argv[[2]]);");
}
@Test
@@ -530,7 +530,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators102() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 0L);`<=`(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'), 0L);`<=`(argv[[1]],argv[[2]]);");
}
@Test
@@ -545,7 +545,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators105() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`<=`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`<=`(argv[[1]]);");
}
@Test
@@ -582,7 +582,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators112() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`!`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`!`(argv[[1]]);");
}
@Test
@@ -745,7 +745,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators144() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`>`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`>`(argv[[1]]);");
}
@Test
@@ -770,7 +770,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators149() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`>=`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`>=`(argv[[1]]);");
}
@Test
@@ -810,7 +810,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators157() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`%%`(argv[[1]],argv[[2]]);");
}
@@ -866,7 +866,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators168() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`%%`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`%%`(argv[[1]]);");
}
@Test
@@ -1523,7 +1523,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators303() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`^`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`^`(argv[[1]]);");
}
@Test
@@ -1674,13 +1674,13 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators332() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`%/%`(argv[[1]]);");
}
@Test
public void testoperators333() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`%/%`(argv[[1]],argv[[2]]);");
}
@@ -1696,7 +1696,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testoperators336() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`&`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`&`(argv[[1]]);");
}
@Test
@@ -1923,7 +1923,7 @@ public class TestBuiltin_operators extends TestBase {
@Test
public void testDispatchToOpsSpecializations() {
- assertEval(Output.ContainsError, "factor(c(\"a\",\"b\",\"c\")) == factor(c(1,2,3))");
+ assertEval(Output.IgnoreErrorContext, "factor(c(\"a\",\"b\",\"c\")) == factor(c(1,2,3))");
assertEval("data.frame(factor(c(1,2,3))) == data.frame(factor(c(1,2,3)))");
assertEval("data.frame(factor(c(1,2,1))) == data.frame(factor(c(1,2,2)))");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmax.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmax.java
index 0ab51cf4fa..ad1b4881be 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmax.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmax.java
@@ -91,19 +91,19 @@ public class TestBuiltin_pmax extends TestBase {
public void testPMax() {
assertEval("{ pmax(c(1L, 7L), c(42L, 1L)) }");
assertEval("{ pmax(c(1L, 7L), integer()) }");
- assertEval(Output.ContainsWarning, "{ pmax(c(1L, 7L, 8L), c(1L), c(42L, 1L)) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmax(c(1L, 7L, 8L), c(1L), c(42L, 1L)) }");
assertEval("{ pmax(c(1L, 7L), c(42L, as.integer(NA))) }");
assertEval("{ pmax(c(1L, 7L), c(42L, as.integer(NA)), na.rm=TRUE) }");
assertEval("{ pmax(c(1, 7), c(42, 1)) }");
assertEval("{ pmax(c(1, 7), double()) }");
- assertEval(Output.ContainsWarning, "{ pmax(c(1, 7, 8), c(1), c(42, 1)) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmax(c(1, 7, 8), c(1), c(42, 1)) }");
assertEval("{ pmax(c(1, 7), c(42, as.double(NA))) }");
assertEval("{ pmax(c(1, 7), c(42, as.double(NA)), na.rm=TRUE) }");
assertEval("{ pmax(c(\"1\", \"7\"), c(\"42\", \"1\")) }");
assertEval("{ pmax(c(\"1\", \"7\"), character()) }");
- assertEval(Output.ContainsWarning, "{ pmax(c(\"1\", \"7\", \"8\"), c(\"1\"), c(\"42\", \"1\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmax(c(\"1\", \"7\", \"8\"), c(\"1\"), c(\"42\", \"1\")) }");
assertEval("{ pmax(c(\"1\", \"7\"), c(\"42\", as.character(NA))) }");
assertEval("{ pmax(c(\"1\", \"7\"), c(\"42\", as.character(NA)), na.rm=TRUE) }");
assertEval("{ pmax(c(\"1\", as.character(NA)), c(\"42\", \"1\"), na.rm=TRUE) }");
@@ -113,7 +113,7 @@ public class TestBuiltin_pmax extends TestBase {
assertEval("{ pmax(c(FALSE, TRUE), logical()) }");
assertEval("{ pmax(c(FALSE, TRUE), c(FALSE, NA)) }");
- assertEval(Output.ContainsError, "{ pmax(as.raw(42)) }");
- assertEval(Output.ContainsError, "{ pmax(7+42i) }");
+ assertEval(Output.IgnoreErrorContext, "{ pmax(as.raw(42)) }");
+ assertEval(Output.IgnoreErrorContext, "{ pmax(7+42i) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmin.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmin.java
index 2581a67819..373b799a38 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmin.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_pmin.java
@@ -76,19 +76,19 @@ public class TestBuiltin_pmin extends TestBase {
public void testPMin() {
assertEval("{ pmin(c(1L, 7L), c(42L, 1L)) }");
assertEval("{ pmin(c(1L, 7L), integer()) }");
- assertEval(Output.ContainsWarning, "{ pmin(c(1L, 7L, 8L), c(1L), c(42L, 1L)) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmin(c(1L, 7L, 8L), c(1L), c(42L, 1L)) }");
assertEval("{ pmin(c(1L, 7L), c(42L, as.integer(NA))) }");
assertEval("{ pmin(c(1L, 7L), c(42L, as.integer(NA)), na.rm=TRUE) }");
assertEval("{ pmin(c(1, 7), c(42, 1)) }");
assertEval("{ pmin(c(1, 7), double()) }");
- assertEval(Output.ContainsWarning, "{ pmin(c(1, 7, 8), c(1), c(42, 1)) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmin(c(1, 7, 8), c(1), c(42, 1)) }");
assertEval("{ pmin(c(1, 7), c(42, as.double(NA))) }");
assertEval("{ pmin(c(1, 7), c(42, as.double(NA)), na.rm=TRUE) }");
assertEval("{ pmin(c(\"1\", \"7\"), c(\"42\", \"1\")) }");
assertEval("{ pmin(c(\"1\", \"7\"), character()) }");
- assertEval(Output.ContainsWarning, "{ pmin(c(\"1\", \"7\", \"8\"), c(\"1\"), c(\"42\", \"1\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ pmin(c(\"1\", \"7\", \"8\"), c(\"1\"), c(\"42\", \"1\")) }");
assertEval("{ pmin(c(\"1\", \"7\"), c(\"42\", as.character(NA))) }");
assertEval("{ pmin(c(\"1\", \"7\"), c(\"42\", as.character(NA)), na.rm=TRUE) }");
assertEval("{ pmin(c(\"1\", as.character(NA)), c(\"42\", \"1\"), na.rm=TRUE) }");
@@ -98,7 +98,7 @@ public class TestBuiltin_pmin extends TestBase {
assertEval("{ pmin(c(FALSE, TRUE), logical()) }");
assertEval("{ pmin(c(FALSE, TRUE), c(FALSE, NA)) }");
- assertEval(Output.ContainsError, "{ pmin(as.raw(42)) }");
- assertEval(Output.ContainsError, "{ pmin(7+42i) }");
+ assertEval(Output.IgnoreErrorContext, "{ pmin(as.raw(42)) }");
+ assertEval(Output.IgnoreErrorContext, "{ pmin(7+42i) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_qr.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_qr.java
index 91b6880a65..03acc3e7bb 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_qr.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_qr.java
@@ -44,7 +44,7 @@ public class TestBuiltin_qr extends TestBase {
assertEval(Ignored.Unknown, "{ round( qr(matrix(1:6,nrow=2), LAPACK=TRUE)$qr, digits=5) }");
// qr.coef
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; qr.coef(x, 1:2) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; qr.coef(x, 1:2) }");
assertEval(Ignored.Unknown, " { x <- qr(cbind(1:10,2:11), LAPACK=TRUE) ; round( qr.coef(x, 1:10), digits=5 ) }");
assertEval(Ignored.Unknown, "{ x <- qr(c(3,1,2), LAPACK=TRUE) ; round( qr.coef(x, c(1,3,2)), digits=5 ) }");
// FIXME: GNU-R will print negative zero as zero
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_quote.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_quote.java
index 689f749a86..712a42df7f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_quote.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_quote.java
@@ -30,8 +30,8 @@ public class TestBuiltin_quote extends TestBase {
assertEval("{ quote(x <- x + 1) }");
assertEval("{ typeof(quote(x)) }");
- assertEval(Output.ContainsError, "{ l <- quote(a[3] <- 4) ; f <- function() { eval(l) } ; f() }");
- assertEval(Output.ContainsError, "{ l <- quote(a[3] <- 4) ; eval(l) ; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ l <- quote(a[3] <- 4) ; f <- function() { eval(l) } ; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ l <- quote(a[3] <- 4) ; eval(l) ; f() }");
assertEval("{ l <- quote(x[1,1] <- 10) ; f <- function() { eval(l) } ; x <- matrix(1:4,nrow=2) ; f() ; x }");
assertEval("{ l <- quote(x[1] <- 1) ; f <- function() { eval(l) } ; x <- 10 ; f() ; x }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java
index 52a7954dfc..5e2b8b7db4 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_range.java
@@ -54,12 +54,12 @@ public class TestBuiltin_range extends TestBase {
@Test
public void testrange8() {
- assertEval(Output.ContainsError, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);range(argv[[1]],argv[[2]]);");
+ assertEval(Output.IgnoreErrorContext, "argv <- list(structure(c(3L, 2L, 1L), .Label = c('A', 'B', 'C'), class = c('ordered', 'factor')), na.rm = FALSE);range(argv[[1]],argv[[2]]);");
}
@Test
public void testrange9() {
- assertEval(Output.ContainsError,
+ assertEval(Output.IgnoreErrorContext,
"argv <- list(structure(list(sec = c(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), min = c(40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L, 50L, 0L, 10L, 20L, 30L, 40L), hour = c(8L, 8L, 9L, 9L, 9L, 9L, 9L, 9L, 10L, 10L, 10L, 10L, 10L, 10L, 11L, 11L, 11L, 11L, 11L, 11L, 12L, 12L, 12L, 12L, 12L, 12L, 13L, 13L, 13L, 13L, 13L, 13L, 14L, 14L, 14L, 14L, 14L, 14L, 15L, 15L, 15L, 15L, 15L, 15L, 16L, 16L, 16L, 16L, 16L, 16L, 17L, 17L, 17L, 17L, 17L, 17L, 18L, 18L, 18L, 18L, 18L, 18L, 19L, 19L, 19L, 19L, 19L, 19L, 20L, 20L, 20L, 20L, 20L, 20L, 21L, 21L, 21L, 21L, 21L, 21L, 22L, 22L, 22L, 22L, 22L, 23L, 23L, 23L, 23L, 23L, 23L, 0L, 0L, 0L, 0L, 0L, 0L, 1L, 1L, 1L, 1L, 1L, 1L, 2L, 2L, 2L, 2L, 2L, 2L, 3L, 3L, 3L, 3L, 3L), mday = c(12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 12L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L, 13L), mon = c(11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L, 11L), year = c(90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L, 90L), wday = c(3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 3L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L, 4L), yday = c(345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 345L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L, 346L), isdst = c(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L)), .Names = c('sec', 'min', 'hour', 'mday', 'mon', 'year', 'wday', 'yday', 'isdst'), class = c('POSIXlt', 'POSIXt')), na.rm = FALSE);range(argv[[1]],argv[[2]]);");
}
@@ -70,7 +70,7 @@ public class TestBuiltin_range extends TestBase {
@Test
public void testrange11() {
- assertEval(Output.ContainsError,
+ assertEval(Output.IgnoreErrorContext,
"argv <- list(structure(c(4L, 5L, 1L, 5L, 3L, 4L, 5L, 3L, 2L, 4L), .Label = c('a', 'c', 'i', 's', 't'), class = c('ordered', 'factor')), structure(c(4L, 2L, 3L, 5L, 4L, 3L, 5L, 1L, 5L, 4L), .Label = c('a', 'c', 'i', 's', 't'), class = c('ordered', 'factor')), na.rm = FALSE);range(argv[[1]],argv[[2]],argv[[3]]);");
}
@@ -136,7 +136,7 @@ public class TestBuiltin_range extends TestBase {
@Test
public void testrange24() {
- assertEval(Output.ContainsWarning, "range( );");
+ assertEval(Output.IgnoreWarningContext, "range( );");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rawShift.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rawShift.java
index d573481848..443b1b946d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rawShift.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rawShift.java
@@ -20,12 +20,12 @@ public class TestBuiltin_rawShift extends TestBase {
@Test
public void testrawShift1() {
- assertEval(Output.ContainsError, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = -10L), .Names = c('x', 'n'));do.call('rawShift', argv)");
- assertEval(Output.ContainsError, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = -9), .Names = c('x', 'n'));do.call('rawShift', argv)");
+ assertEval(Output.IgnoreErrorContext, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = -10L), .Names = c('x', 'n'));do.call('rawShift', argv)");
+ assertEval(Output.IgnoreErrorContext, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = -9), .Names = c('x', 'n'));do.call('rawShift', argv)");
for (int i = -8; i <= 8; i++) {
assertEval("argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = " + i + "L), .Names = c('x', 'n'));do.call('rawShift', argv)");
assertEval("argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = " + i + ".1), .Names = c('x', 'n'));do.call('rawShift', argv)");
}
- assertEval(Output.ContainsError, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = 9), .Names = c('x', 'n'));do.call('rawShift', argv)");
+ assertEval(Output.IgnoreErrorContext, "argv <- structure(list(x = as.raw(c(0, 1, 32, 127, 128, 255, 123)), n = 9), .Names = c('x', 'n'));do.call('rawShift', argv)");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rbind.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rbind.java
index 57f1c5f9d6..49eb602222 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rbind.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rbind.java
@@ -44,7 +44,7 @@ public class TestBuiltin_rbind extends TestBase {
assertEval("{ rbind(1:3,1:3) }");
assertEval("{ m <- matrix(1:6, ncol=2) ; rbind(m, 11:12) }");
assertEval("{ m <- matrix(1:6, ncol=2) ; rbind(11:12, m) }");
- assertEval(Output.ContainsWarning, "{ m <- matrix(1:6, nrow=2) ; rbind(11:12, m) }");
+ assertEval(Output.IgnoreWarningContext, "{ m <- matrix(1:6, nrow=2) ; rbind(11:12, m) }");
assertEval("{ rbind(c(1,2)) }");
assertEval("{ rbind(a=c(b=1,c=2)) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_repint.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_repint.java
index 101c59a583..95d6a0a9cd 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_repint.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_repint.java
@@ -164,6 +164,6 @@ public class TestBuiltin_repint extends TestBase {
assertEval("{ rep.int(c(1,2,3),c(2,8,3)) }");
assertEval("{ rep.int(seq_len(2), rep.int(8, 2)) }");
- assertEval(Output.ContainsError, "{ rep.int(c(1,2,3),c(2,8)) }");
+ assertEval(Output.IgnoreErrorContext, "{ rep.int(c(1,2,3),c(2,8)) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java
index 208856b5fc..8e14c8b34e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowMeans.java
@@ -60,6 +60,6 @@ public class TestBuiltin_rowMeans extends TestBase {
// Error message mismatch
assertEval(Ignored.Unknown, "{rowMeans(matrix(NA,NA,NA),TRUE)}");
- assertEval(Output.ContainsError, "{x<-matrix(c(\"1\",\"2\",\"3\",\"4\"),ncol=2);rowMeans(x)}");
+ assertEval(Output.IgnoreErrorContext, "{x<-matrix(c(\"1\",\"2\",\"3\",\"4\"),ncol=2);rowMeans(x)}");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java
index a6b34a235b..a84133cafb 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_rowSums.java
@@ -100,6 +100,6 @@ public class TestBuiltin_rowSums extends TestBase {
// rowSums on array have correct values
assertEval("{ a = rowSums(array(1:24,c(2,3,4))); c(a[1],a[2]) }");
- assertEval(Output.ContainsError, "{x<-matrix(c(\"1\",\"2\",\"3\",\"4\"),ncol=2);rowSums(x)}");
+ assertEval(Output.IgnoreErrorContext, "{x<-matrix(c(\"1\",\"2\",\"3\",\"4\"),ncol=2);rowSums(x)}");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_scan.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_scan.java
index 9468ee7666..d317ae23a5 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_scan.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_scan.java
@@ -24,13 +24,13 @@ public class TestBuiltin_scan extends TestBase {
assertEval("{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, skip = 1, quiet = TRUE) }");
assertEval("{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, skip = 1) }");
assertEval("{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, skip = 1, nlines = 1) }");
- assertEval(Output.ContainsWarning, "{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, what = list(\"\",\"\",\"\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, what = list(\"\",\"\",\"\")) }");
assertEval("{ con<-textConnection(c(\"TITLE extra line\", \"2 3 5 7\", \"11 13 17\")); scan(con, what = list(\"\",\"\",\"\"), flush=TRUE) }");
assertEval("{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, skip = 1) }");
assertEval("{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, skip = 1, quiet=TRUE) }");
assertEval("{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, skip = 1, nlines = 1) }");
- assertEval(Output.ContainsWarning, "{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, what = list(\"\",\"\",\"\")) }");
+ assertEval(Output.IgnoreWarningContext, "{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, what = list(\"\",\"\",\"\")) }");
assertEval("{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, what = list(\"\",\"\",\"\"), fill=TRUE) }");
assertEval("{ con<-textConnection(c(\"HEADER\", \"7 2 3\", \"4 5 42\")); scan(con, what = list(\"\",\"\",\"\"), multi.line=FALSE) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_sep.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_sep.java
index d8f244561a..8e63ca6f7b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_sep.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_sep.java
@@ -39,7 +39,7 @@ public class TestBuiltin_sep extends TestBase {
@Test
public void testsep5() {
- assertEval(Output.ContainsWarning, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`/`(argv[[1]]);");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(structure(integer(0), .Label = character(0), class = 'factor'));`/`(argv[[1]]);");
}
@Test
@@ -81,7 +81,7 @@ public class TestBuiltin_sep extends TestBase {
@Test
public void testsep13() {
- assertEval(Output.ContainsWarning,
+ assertEval(Output.IgnoreWarningContext,
"argv <- list(structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'), structure(list(c0 = structure(integer(0), .Label = character(0), class = 'factor')), .Names = 'c0', row.names = character(0), class = 'data.frame'));`/`(argv[[1]],argv[[2]]);");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seq.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seq.java
index a6df01379e..05ada21434 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seq.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seq.java
@@ -144,7 +144,7 @@ public class TestBuiltin_seq extends TestBase {
@Test
public void testseq27() {
- assertEval(Output.ContainsWarning, "argv <- list(c(2L, 2L));do.call('seq_len', argv)");
+ assertEval(Output.IgnoreWarningContext, "argv <- list(c(2L, 2L));do.call('seq_len', argv)");
}
@Test
@@ -174,10 +174,10 @@ public class TestBuiltin_seq extends TestBase {
assertEval("{ seq(0L,0L,0L) }");
assertEval("{ seq(0L,0L) }");
assertEval("{ seq(0,0,1i) }");
- assertEval(Output.ContainsError, "{ seq(integer(), 7) }");
- assertEval(Output.ContainsError, "{ seq(c(1,2), 7) }");
- assertEval(Output.ContainsError, "{ seq(7, integer()) }");
- assertEval(Output.ContainsError, "{ seq(7, c(41,42)) }");
+ assertEval(Output.IgnoreErrorContext, "{ seq(integer(), 7) }");
+ assertEval(Output.IgnoreErrorContext, "{ seq(c(1,2), 7) }");
+ assertEval(Output.IgnoreErrorContext, "{ seq(7, integer()) }");
+ assertEval(Output.IgnoreErrorContext, "{ seq(7, c(41,42)) }");
assertEval("{ seq(integer()) }");
assertEval("{ seq(double()) }");
assertEval("{ seq(from=3L, length.out=3L) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seqint.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seqint.java
index a08279ff16..f52196a99c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seqint.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seqint.java
@@ -139,7 +139,7 @@ public class TestBuiltin_seqint extends TestBase {
@Test
public void testseqint26() {
- assertEval(Output.ContainsError, "argv <- list(NaN, NaN);do.call('seq.int', argv)");
+ assertEval(Output.IgnoreErrorContext, "argv <- list(NaN, NaN);do.call('seq.int', argv)");
}
@Test
@@ -154,6 +154,6 @@ public class TestBuiltin_seqint extends TestBase {
@Test
public void testseqint29() {
- assertEval(Output.ContainsError, "argv <- list(NaN);do.call('seq.int', argv)");
+ assertEval(Output.IgnoreErrorContext, "argv <- list(NaN);do.call('seq.int', argv)");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seterrmessage.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seterrmessage.java
index f413de6e90..e518a8a09b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seterrmessage.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_seterrmessage.java
@@ -19,7 +19,7 @@ public class TestBuiltin_seterrmessage extends TestBase {
@Test
public void testseterrmessage1() {
- assertEval(Output.ContainsError, "argv <- list('Error in cor(rnorm(10), NULL) : \\n supply both 'x' and 'y' or a matrix-like 'x'\\n'); .Internal(seterrmessage(argv[[1]]))");
+ assertEval(Output.IgnoreErrorContext, "argv <- list('Error in cor(rnorm(10), NULL) : \\n supply both 'x' and 'y' or a matrix-like 'x'\\n'); .Internal(seterrmessage(argv[[1]]))");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substr.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substr.java
index 018854d523..084c6ca325 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substr.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_substr.java
@@ -83,8 +83,8 @@ public class TestBuiltin_substr extends TestBase {
assertEval("{ substr(1234L,2,3) }");
assertEval("{ substr(1234,2,3) }");
assertEval("{ substr(\"abcdef\",c(1,2),c(3L,5L)) }");
- assertEval(Output.ContainsError, "{ substr(c(\"abcdef\", \"aa\"), integer(), 2) }");
- assertEval(Output.ContainsError, "{ substr(c(\"abcdef\", \"aa\"), 2, integer()) }");
+ assertEval(Output.IgnoreErrorContext, "{ substr(c(\"abcdef\", \"aa\"), integer(), 2) }");
+ assertEval(Output.IgnoreErrorContext, "{ substr(c(\"abcdef\", \"aa\"), 2, integer()) }");
assertEval("{ substr(character(), integer(), integer()) }");
assertEval("{ substr(c(\"abcdef\", \"aa\"), NA, 4) }");
assertEval("{ substr(c(\"abcdef\", \"aa\"), 3, NA) }");
@@ -102,10 +102,10 @@ public class TestBuiltin_substr extends TestBase {
assertEval("{ x<-\"abcdef\"; substr(x,1,NA)<-\"0\"; x }");
assertEval("{ x<-character(); substr(x,1,3)<-\"0\"; x }");
assertEval("{ x<-c(\"abcdef\", \"ghijklm\"); substr(x, c(1,NA), 4)<-\"0\"; x }");
- assertEval(Output.ContainsError, "{ x<-\"abcdef\"; substr(x,3,1)<-0; x }");
- assertEval(Output.ContainsError, "{ x<-\"abcdef\"; substr(x,1,3)<-character(); x }");
- assertEval(Output.ContainsError, "{ x<-\"abcdef\"; substr(x,1,3)<-NULL; x }");
- assertEval(Output.ContainsError, "{ x<-\"abcdef\"; substr(x,integer(),3)<-NULL; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-\"abcdef\"; substr(x,3,1)<-0; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-\"abcdef\"; substr(x,1,3)<-character(); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-\"abcdef\"; substr(x,1,3)<-NULL; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-\"abcdef\"; substr(x,integer(),3)<-NULL; x }");
assertEval("{ x<-character(); substr(x,1,3)<-0; x }");
assertEval("{ x<-character(); substr(x,1,3)<-NULL; x }");
assertEval("{ x<-character(); substr(x,integer(),3)<-NULL; x }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_switch.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_switch.java
index dfd0c6fd57..1c6c703bc2 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_switch.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_switch.java
@@ -47,7 +47,7 @@ public class TestBuiltin_switch extends TestBase {
assertEval("{ x <- \"<\"; switch(x, \"<=\" =, \"<\" =, \">\" =, FALSE) }");
assertEval("{ a <- NULL ; switch(mode(a), NULL=\"naught\") }");
assertEval("{ a <- NULL ; switch(mode(a), NULL=) }");
- assertEval(Output.ContainsError, "{ x <- \"!\"; v <- switch(x, v77, \"<=\" =, \"<\" =, \">\" = 99, v55)}");
+ assertEval(Output.IgnoreErrorContext, "{ x <- \"!\"; v <- switch(x, v77, \"<=\" =, \"<\" =, \">\" = 99, v55)}");
assertEval("{ x <- \"!\"; v <- switch(x, \"\"=v77, \"<=\" =, \"<\" =, \">\" = 99, v55)}");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java
index 03f24f026d..fb7a8fce4d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_unlist.java
@@ -96,7 +96,7 @@ public class TestBuiltin_unlist extends TestBase {
@Test
public void testunlist16() {
- assertEval(Output.ContainsAmbiguousError,
+ assertEval(Output.IgnoreErrorMessage,
"argv <- list(structure('print(.leap.seconds, tz = \\\'PST8PDT\\\') # and in Seattle's\\n', Rd_tag = 'RCODE'), TRUE, TRUE); .Internal(unlist(argv[[1]], argv[[2]], argv[[3]]))");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
index 027e3d94ce..20a1daf0a1 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestMiscBuiltins.java
@@ -42,7 +42,7 @@ public class TestMiscBuiltins extends TestBase {
public void testCasts() {
// shortcuts in views (only some combinations)
assertEval("{ as.complex(as.character(c(1+1i,1+1i))) }");
- assertEval(Output.ContainsWarning, "{ as.complex(as.integer(c(1+1i,1+1i))) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.complex(as.integer(c(1+1i,1+1i))) }");
assertEval("{ as.complex(as.logical(c(1+1i,1+1i))) }");
assertEval("{ as.double(as.logical(c(10,10))) }");
@@ -99,8 +99,8 @@ public class TestMiscBuiltins extends TestBase {
assertEval("{ x <- 1:3; z <- as.matrix(x); x }");
assertEval("{ x <- 1:3 ; attr(x,\"my\") <- 10 ; attributes(as.matrix(x)) }");
- assertEval(Output.ContainsWarning, "{ as.complex(as.double(c(1+1i,1+1i))) }");
- assertEval(Output.ContainsWarning, "{ as.complex(as.raw(c(1+1i,1+1i))) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.complex(as.double(c(1+1i,1+1i))) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.complex(as.raw(c(1+1i,1+1i))) }");
}
@Test
@@ -247,8 +247,8 @@ public class TestMiscBuiltins extends TestBase {
@Test
public void testWorkingDirectory() {
assertEval("{ cur <- getwd(); cur1 <- setwd(getwd()) ; cur2 <- getwd() ; cur == cur1 && cur == cur2 }");
- assertEval(Output.ContainsError, "{ setwd(1) }");
- assertEval(Output.ContainsError, "{ setwd(character()) }");
+ assertEval(Output.IgnoreErrorContext, "{ setwd(1) }");
+ assertEval(Output.IgnoreErrorContext, "{ setwd(character()) }");
assertEval("{ cur <- getwd(); cur1 <- setwd(c(cur, \"dummy\")) ; cur2 <- getwd() ; cur == cur1 }");
}
@@ -269,7 +269,7 @@ public class TestMiscBuiltins extends TestBase {
@Test
public void testSimpleRm() {
assertEval("{ x <- 200 ; rm(\"x\") ; x }");
- assertEval(Output.ContainsWarning, "{ rm(\"ieps\") }");
+ assertEval(Output.IgnoreWarningContext, "{ rm(\"ieps\") }");
assertEval("{ x <- 200 ; rm(\"x\") }");
assertEval("{ x<-200; y<-100; rm(\"x\", \"y\"); x }");
assertEval("{ x<-200; y<-100; rm(\"x\", \"y\"); y }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestFunctions.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestFunctions.java
index 783db2436b..88fff7802e 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestFunctions.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/functions/TestFunctions.java
@@ -76,7 +76,7 @@ public class TestFunctions extends TestBase {
assertEval("{ matrix(x=1) }");
assertEval("{ set.seed(4357); round( rnorm(1,), digits = 5 ) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ max(1,2,) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ max(1,2,) }");
}
@Test
@@ -147,11 +147,11 @@ public class TestFunctions extends TestBase {
assertEval("{ x<-function(){1} ; x(y=1) }");
assertEval("{ f <- function(a,b,c,d) { a + b } ; f(1,x=1,2,3,4) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x<-function(y, b){1} ; x(y=1, 2, 3, z = 5) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x<-function(a){1} ; x(1,) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x<-function(y, b){1} ; x(y=1, 2, 3, z = 5) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x<-function(a){1} ; x(1,) }");
// note exactly GNU-R message
- assertEval(Ignored.Unknown, Output.ContainsError, "{ f <- function(a,a) {1} }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a,a) {1} }");
}
@Test
@@ -252,8 +252,8 @@ public class TestFunctions extends TestBase {
assertEval("{ f.numeric<-function(x, row.names = NULL, optional = FALSE, ..., nm = NULL) { print(optional); print(nm) }; f<-function(x, row.names = NULL, optional = FALSE, ...) { UseMethod(\"f\") }; f(c(1,2), row.names = \"r1\", nm=\"bar\") }");
// Checkstyle: resume line length check
- assertEval(Output.ContainsError, "{ f <- function(x) { ..1 } ; f(10) }");
- assertEval(Output.ContainsError, "{ f <- function(...) { ..1 } ; f() }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { ..1 } ; f(10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(...) { ..1 } ; f() }");
assertEval("{ fn1 <- function (a, b) a + b; fn2 <- function (a, b, ...) fn1(a, b, ...); fn2(1, 1) }");
assertEval("{ asdf <- function(x,...) UseMethod(\"asdf\",x); asdf.numeric <- function(x, ...) print(paste(\"num:\", x, ...)); asdf(1) }");
@@ -263,7 +263,7 @@ public class TestFunctions extends TestBase {
assertEval("{ f <- function(...) { g <- function() { ..1 } ; g() } ; f(a=2) }");
assertEval("{ f <- function(...) { ..1 <- 2 ; ..1 } ; f(z = 1) }");
assertEval("{ f <- function(...) { ..1 <- 2 ; get(\"..1\") } ; f(1,2,3,4) }");
- assertEval(Output.ContainsError, "{ f <- function(...) { get(\"..1\") } ; f(1,2,3,4) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(...) { get(\"..1\") } ; f(1,2,3,4) }");
assertEval("{ g <- function(a,b) { a + b } ; f <- function(...) { g(...) } ; f(1,2) }");
assertEval("{ g <- function(a,b,x) { a + b * x } ; f <- function(...) { g(...,x=4) } ; f(b=1,a=2) }");
@@ -273,7 +273,7 @@ public class TestFunctions extends TestBase {
assertEval("{ g <- function(a,b,aa,bb) { a ; x <<- 10 ; aa ; c(a, aa) } ; f <- function(...) { g(..., ...) } ; x <- 1; y <- 2; f(x, y) }");
assertEval("{ f <- function(a, b) { a - b } ; g <- function(...) { f(1, ...) } ; g(a = 2) }");
- assertEval(Output.ContainsError, "{ f <- function(...) { ..3 } ; f(1,2) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(...) { ..3 } ; f(1,2) }");
assertEval("{ f <- function() { dummy() } ; f() }");
assertEval("{ f <- function() { if (FALSE) { dummy <- 2 } ; dummy() } ; f() }");
@@ -328,12 +328,12 @@ public class TestFunctions extends TestBase {
assertEval(Ignored.Unknown, "{ f <- function(...) { substitute(..1) } ; f(x+y) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ lapply(1:3, \"dummy\") }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ lapply(1:3, \"dummy\") }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ..., x=2,z=3) } ; g(1) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ...,,,) } ; g(1) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ f <- function(...) { ..2 + ..2 } ; f(1,,2) }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ f <- function(...) { ..1 + ..2 } ; f(1,,3) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ..., x=2,z=3) } ; g(1) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(a, barg, bextra, dummy) { a + barg } ; g <- function(...) { f(a=1, ...,,,) } ; g(1) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(...) { ..2 + ..2 } ; f(1,,2) }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ f <- function(...) { ..1 + ..2 } ; f(1,,3) }");
}
@Test
@@ -375,8 +375,8 @@ public class TestFunctions extends TestBase {
@Test
public void testDefaultArgs() {
- assertEval(Output.ContainsError, "{ array(dim=c(-2,2)); }");
- assertEval(Output.ContainsError, "{ array(dim=c(-2,-2)); }");
+ assertEval(Output.IgnoreErrorContext, "{ array(dim=c(-2,2)); }");
+ assertEval(Output.IgnoreErrorContext, "{ array(dim=c(-2,-2)); }");
assertEval("{ length(array(dim=c(1,0,2,3))) }");
assertEval("{ dim(array(dim=c(2.1,2.9,3.1,4.7))) }");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConditionHandling.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConditionHandling.java
index 68c121c3df..938ca47fe0 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConditionHandling.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConditionHandling.java
@@ -32,7 +32,7 @@ public class TestConditionHandling extends TestBase {
public void testTryCatch() {
assertEval("{ tryCatch(1, finally = print(\"Hello\")) }");
assertEval("{ e <- simpleError(\"test error\"); tryCatch(stop(e), finally = print(\"Hello\")) }");
- assertEval(Output.ContainsError, "{ tryCatch(stop(\"fred\"), finally = print(\"Hello\")) }");
+ assertEval(Output.IgnoreErrorContext, "{ tryCatch(stop(\"fred\"), finally = print(\"Hello\")) }");
assertEval("{ e <- simpleError(\"test error\"); tryCatch(stop(e), error = function(e) e, finally = print(\"Hello\"))}");
assertEval(Ignored.Unknown, "{ tryCatch(stop(\"fred\"), error = function(e) e, finally = print(\"Hello\"))}");
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java
index 527540999c..6a7c81b9e4 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestConnections.java
@@ -85,7 +85,7 @@ public class TestConnections extends TestBase {
@Test
public void testWriteTextReadConnection() {
- assertEval(Output.ContainsError, "{ writeChar(\"x\", textConnection(\"abc\")) }");
+ assertEval(Output.IgnoreErrorContext, "{ writeChar(\"x\", textConnection(\"abc\")) }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
index 4aed41d850..31066d5f1b 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestEnvironments.java
@@ -56,8 +56,8 @@ public class TestEnvironments extends TestBase {
assertEval("{ x <- 3 ; f <- function() { exists(\"x\", inherits=FALSE) } ; f() }");
assertEval("{ x <- 2 ; y <- 3 ; rm(\"y\") ; ls() }");
- assertEval(Output.ContainsError, "{ x <- 2 ; rm(\"x\") ; get(\"x\") }");
- assertEval(Output.ContainsError, "{ get(\"x\") }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- 2 ; rm(\"x\") ; get(\"x\") }");
+ assertEval(Output.IgnoreErrorContext, "{ get(\"x\") }");
assertEval("{ f <- function() { assign(\"x\", 1) ; y <- 2 ; ls() } ; sort(f()) }");
assertEval("{ f <- function() { x <- 1 ; y <- 2 ; ls() } ; sort(f()) }");
@@ -238,26 +238,26 @@ public class TestEnvironments extends TestBase {
assertEval("{ e<-new.env(); assign(\"a\", 1, e); lockBinding(\"a\", e); bindingIsLocked(\"a\", e) }");
// rm
- assertEval(Output.ContainsError, "{ rm(\"foo\", envir = baseenv()) }");
- assertEval(Output.ContainsError, "{ e<-new.env(); assign(\"a\", 1, e) ; lockEnvironment(e); rm(\"a\",envir = e); }");
+ assertEval(Output.IgnoreErrorContext, "{ rm(\"foo\", envir = baseenv()) }");
+ assertEval(Output.IgnoreErrorContext, "{ e<-new.env(); assign(\"a\", 1, e) ; lockEnvironment(e); rm(\"a\",envir = e); }");
// ok to removed a locked binding
assertEval("{ e<-new.env(); assign(\"a\", 1, e) ; lockBinding(\"a\", e); rm(\"a\",envir = e); ls() }");
assertEval("{ e<-new.env(); assign(\"a\", 1, e) ; rm(\"a\",envir = e); ls() }");
// get
- assertEval(Output.ContainsError, "{ e<-new.env(); get(\"x\", e) }");
+ assertEval(Output.IgnoreErrorContext, "{ e<-new.env(); get(\"x\", e) }");
assertEval("{ e<-new.env(); x<-1; get(\"x\", e) }");
assertEval("{ e<-new.env(); assign(\"x\", 1, e); get(\"x\", e) }");
- assertEval(Output.ContainsError, "{ e<-new.env(); x<-1; get(\"x\", e, inherits=FALSE) }");
- assertEval(Output.ContainsError, "{ e<-new.env(parent=emptyenv()); x<-1; get(\"x\", e) }");
+ assertEval(Output.IgnoreErrorContext, "{ e<-new.env(); x<-1; get(\"x\", e, inherits=FALSE) }");
+ assertEval(Output.IgnoreErrorContext, "{ e<-new.env(parent=emptyenv()); x<-1; get(\"x\", e) }");
// misc
- assertEval(Output.ContainsError, "{ h <- new.env(parent=emptyenv()) ; assign(\"y\", 2, h) ; get(\"z\", h) }");
+ assertEval(Output.IgnoreErrorContext, "{ h <- new.env(parent=emptyenv()) ; assign(\"y\", 2, h) ; get(\"z\", h) }");
assertEval("{ plus <- function(x) { function(y) x + y } ; plus_one <- plus(1) ; ls(environment(plus_one)) }");
assertEval("{ ls(.GlobalEnv) }");
assertEval("{ x <- 1 ; ls(.GlobalEnv) }");
- assertEval(Output.ContainsError, "{ ph <- new.env(parent=emptyenv()) ; h <- new.env(parent=ph) ; assign(\"x\", 10, h, inherits=TRUE) ; get(\"x\", ph)}");
- assertEval(Output.ContainsError, "{ ph <- new.env() ; h <- new.env(parent=ph) ; assign(\"x\", 2, h) ; assign(\"x\", 10, h, inherits=TRUE) ; get(\"x\", ph)}");
+ assertEval(Output.IgnoreErrorContext, "{ ph <- new.env(parent=emptyenv()) ; h <- new.env(parent=ph) ; assign(\"x\", 10, h, inherits=TRUE) ; get(\"x\", ph)}");
+ assertEval(Output.IgnoreErrorContext, "{ ph <- new.env() ; h <- new.env(parent=ph) ; assign(\"x\", 2, h) ; assign(\"x\", 10, h, inherits=TRUE) ; get(\"x\", ph)}");
assertEval("{ h <- new.env(parent=globalenv()) ; assign(\"x\", 10, h, inherits=TRUE) ; x }");
assertEval("{ ph <- new.env() ; h <- new.env(parent=ph) ; assign(\"x\", 10, h, inherits=TRUE) ; x }");
@@ -267,7 +267,7 @@ public class TestEnvironments extends TestBase {
@Test
public void testEnvironmentAssignLocked() {
- assertEval(Ignored.Unknown, Output.ContainsError, "{ x <- 1; lockBinding(\"x\", globalenv()); x <- 1 }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ x <- 1; lockBinding(\"x\", globalenv()); x <- 1 }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java
index b0ed51a5ea..4dc124ca5c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArithmetic.java
@@ -322,10 +322,10 @@ public class TestSimpleArithmetic extends TestBase {
@Test
public void testVectorsLengthWarning() {
- assertEval(Output.ContainsWarning, "{ 1:2+1:3 }");
- assertEval(Output.ContainsWarning, "{ 1:3*1:2 }");
- assertEval(Output.ContainsWarning, "{ 1:3+c(1,2+2i) }");
- assertEval(Output.ContainsWarning, "{ c(1,2+2i)+1:3 }");
+ assertEval(Output.IgnoreWarningContext, "{ 1:2+1:3 }");
+ assertEval(Output.IgnoreWarningContext, "{ 1:3*1:2 }");
+ assertEval(Output.IgnoreWarningContext, "{ 1:3+c(1,2+2i) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(1,2+2i)+1:3 }");
}
@Test
@@ -336,7 +336,7 @@ public class TestSimpleArithmetic extends TestBase {
@Test
public void testVectorsMatrixDimsDontMatch() {
- assertEval(Output.ContainsError, "{ m <- matrix(nrow=2, ncol=2, 1:4) ; m + 1:16 }");
+ assertEval(Output.IgnoreErrorContext, "{ m <- matrix(nrow=2, ncol=2, 1:4) ; m + 1:16 }");
}
@Test
@@ -614,11 +614,11 @@ public class TestSimpleArithmetic extends TestBase {
@Test
public void testNonvectorizedLogicalLengthChecks() {
- assertEval(Output.ContainsWarning, "{ as.raw(c(1,4)) | as.raw(c(1,5,4)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1,5,4)) | as.raw(c(1,4)) }");
- assertEval(Output.ContainsWarning, "{ c(TRUE, FALSE, FALSE) & c(TRUE,TRUE) }");
- assertEval(Output.ContainsWarning, "{ c(TRUE, TRUE) & c(TRUE, FALSE, FALSE) }");
- assertEval(Output.ContainsWarning, "{ c(a=TRUE, TRUE) | c(TRUE, b=FALSE, FALSE) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1,4)) | as.raw(c(1,5,4)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1,5,4)) | as.raw(c(1,4)) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(TRUE, FALSE, FALSE) & c(TRUE,TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(TRUE, TRUE) & c(TRUE, FALSE, FALSE) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(a=TRUE, TRUE) | c(TRUE, b=FALSE, FALSE) }");
}
@Test
@@ -706,27 +706,27 @@ public class TestSimpleArithmetic extends TestBase {
assertEval("{ x<-1:4; y<-21:24; names(y)<-121:124; attributes(x | y) }");
assertEval("{ x<-1:4; names(x)<-101:104; y<-21:28; names(y)<-121:128; attributes(y | x) }");
assertEval("{ x<-1:4; names(x)<-101:104; y<-21:28; attributes(x | y) }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); y<-21:28; x | y }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); y<-21:28; x | y }");
}
@Test
public void testIntegerOverflow() {
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ x <- 2147483647L ; x + 1L }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ x <- 2147483647L ; x * x }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ x <- -2147483647L ; x - 2L }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ x <- -2147483647L ; x - 1L }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ 2147483647L + 1:3 }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ 2147483647L + c(1L,2L,3L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ 1:3 + 2147483647L }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(1L,2L,3L) + 2147483647L }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ 1:3 + c(2147483647L,2147483647L,2147483647L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(2147483647L,2147483647L,2147483647L) + 1:3 }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(1L,2L,3L) + c(2147483647L,2147483647L,2147483647L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(2147483647L,2147483647L,2147483647L) + c(1L,2L,3L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ 1:4 + c(2147483647L,2147483647L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(2147483647L,2147483647L) + 1:4 }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(1L,2L,3L,4L) + c(2147483647L,2147483647L) }");
- assertEval(Ignored.Unknown, Output.ContainsWarning, "{ c(2147483647L,2147483647L) + c(1L,2L,3L,4L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ x <- 2147483647L ; x + 1L }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ x <- 2147483647L ; x * x }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ x <- -2147483647L ; x - 2L }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ x <- -2147483647L ; x - 1L }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ 2147483647L + 1:3 }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ 2147483647L + c(1L,2L,3L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ 1:3 + 2147483647L }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(1L,2L,3L) + 2147483647L }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ 1:3 + c(2147483647L,2147483647L,2147483647L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(2147483647L,2147483647L,2147483647L) + 1:3 }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(1L,2L,3L) + c(2147483647L,2147483647L,2147483647L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(2147483647L,2147483647L,2147483647L) + c(1L,2L,3L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ 1:4 + c(2147483647L,2147483647L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(2147483647L,2147483647L) + 1:4 }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(1L,2L,3L,4L) + c(2147483647L,2147483647L) }");
+ assertEval(Ignored.Unknown, Output.IgnoreWarningContext, "{ c(2147483647L,2147483647L) + c(1L,2L,3L,4L) }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
index 145aff510b..812d9ee90c 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleArrays.java
@@ -89,10 +89,10 @@ public class TestSimpleArrays extends TestBase {
// negative length vectors are not allowed is the error reported by gnu-r
// negative dims not allowed by R, special GNU message
- assertEval(Output.ContainsError, "{ array(NA, dim=c(-2,2)); }");
+ assertEval(Output.IgnoreErrorContext, "{ array(NA, dim=c(-2,2)); }");
// negative dims not allowed
- assertEval(Output.ContainsError, "{ array(NA, dim=c(-2,-2)); }");
+ assertEval(Output.IgnoreErrorContext, "{ array(NA, dim=c(-2,-2)); }");
// zero dimension array has length 0
assertEval("{ length(array(NA, dim=c(1,0,2,3))) }");
@@ -352,7 +352,7 @@ public class TestSimpleArrays extends TestBase {
assertEval("{ x<-as.double(1:8); dim(x)<-c(2,2,2); x[1,1,1]<-42L; x }");
assertEval("{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[1:2,1:2,0]<-y); x }");
assertEval("{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[1:2,1:2,c(0,0)]<-y); x }");
- assertEval(Output.ContainsError, "{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[0,5,1] <- y); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[0,5,1] <- y); x }");
assertEval("{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[1:2, c(1, NA), 1] <- y); x }");
assertEval("{ x<-1:8; dim(x)<-c(2,2,2); x[1, 1, 1] = as.raw(42); x }");
assertEval("{ x<-1.1:8.8; dim(x)<-c(2,2,2); x[1, 1, 1] = as.raw(42); x }");
@@ -387,7 +387,7 @@ public class TestSimpleArrays extends TestBase {
assertEval("{ a <- 1:9 ; a[1, 1, 1] <- 10L }");
assertEval("{ m <- matrix(1:6, nrow=2) ; m[[1, 1]] <- integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ m <- matrix(1:6, nrow=2) ; m[[1:2, 1]] <- integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ m <- matrix(1:6, nrow=2) ; m[[1:2, 1]] <- integer() }");
assertEval("{ m <- matrix(1:6, nrow=2) ; m[1, 2] <- integer() }");
assertEval("{ m <- matrix(1:6, nrow=2) ; m[1, 2] <- 1:3 }");
@@ -400,7 +400,7 @@ public class TestSimpleArrays extends TestBase {
assertEval("{ m <- matrix(1:6, nrow=2) ; f <- function(i,j) { m[i,j] <- 10 ; m } ; m <- f(1,c(-1,-10)) ; m <- f(-1,2) ; m }");
assertEval("{ m <- matrix(1:6, nrow=2) ; f <- function(i,j) { m[i,j] <- 10 ; m } ; m <- f(2,1:3) ; m <- f(1,-2) ; m }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[1:2,c(1,2,NA),1]<-y); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:8; dim(x)<-c(2,2,2); y<-c(101:104); dim(y)<-c(2,2); z<-(x[1:2,c(1,2,NA),1]<-y); x }");
assertEval("{ m <- matrix(1:6, nrow=3) ; m[2] <- list(100) ; m }");
@@ -414,8 +414,8 @@ public class TestSimpleArrays extends TestBase {
assertEval("{ m <- array(1:3, dim=c(3,1,1)) ; f <- function(x,v) { x[[2,1,1]] <- v ; x } ; f(m,10L) ; f(m,10) ; x <- f(m,11L) ; c(x[1],x[2],x[3]) }");
// error reporting
- assertEval(Output.ContainsError, "{ m <- matrix(1:6, nrow=2) ; m[[1:2,1]] <- 1 }");
- assertEval(Output.ContainsError, "{ m <- matrix(1:6, nrow=2) ; m[[integer(),1]] <- 1 }");
+ assertEval(Output.IgnoreErrorContext, "{ m <- matrix(1:6, nrow=2) ; m[[1:2,1]] <- 1 }");
+ assertEval(Output.IgnoreErrorContext, "{ m <- matrix(1:6, nrow=2) ; m[[integer(),1]] <- 1 }");
// recovery from scalar selection update
assertEval("{ m <- matrix(as.double(1:6), nrow=2) ; mi <- matrix(1:6, nrow=2) ; f <- function(v,i,j) { v[i,j] <- 100 ; v[i,j] * i * j } ; f(m, 1L, 2L) ; f(m,1L,TRUE) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleComparison.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleComparison.java
index c24094c06d..06dec089c8 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleComparison.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleComparison.java
@@ -26,7 +26,7 @@ public class TestSimpleComparison extends TestBase {
assertEval("{ x<-1:4; y<-21:24; names(y)<-121:124; attributes(x > y) }");
assertEval("{ x<-1:4; names(x)<-101:104; y<-21:28; names(y)<-121:128; attributes(y > x) }");
assertEval("{ x<-1:4; names(x)<-101:104; y<-21:28; attributes(x > y) }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); y<-21:28; x > y }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); y<-21:28; x > y }");
assertEval("{ x<-factor(c(a=1)); y<-factor(c(b=1)); x==y }");
}
@@ -208,18 +208,18 @@ public class TestSimpleComparison extends TestBase {
assertEval("{ 1:3 == TRUE }");
assertEval("{ TRUE == 1:3 }");
- assertEval(Output.ContainsWarning, "{ c(1,2) < c(2,1,4) }");
- assertEval(Output.ContainsWarning, "{ c(2,1,4) < c(1,2) }");
- assertEval(Output.ContainsWarning, "{ c(1L,2L) < c(2L,1L,4L) }");
- assertEval(Output.ContainsWarning, "{ c(2L,1L,4L) < c(1L,2L) }");
- assertEval(Output.ContainsWarning, "{ c(TRUE,FALSE,FALSE) < c(TRUE,TRUE) }");
- assertEval(Output.ContainsWarning, "{ c(TRUE,TRUE) == c(TRUE,FALSE,FALSE) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(1,2)) < as.raw(c(2,1,4)) }");
- assertEval(Output.ContainsWarning, "{ as.raw(c(2,1,4)) < as.raw(c(1,2)) }");
- assertEval(Output.ContainsWarning, "{ c(\"hi\",\"hello\",\"bye\") > c(\"cau\", \"ahoj\") }");
- assertEval(Output.ContainsWarning, "{ c(\"cau\", \"ahoj\") != c(\"hi\",\"hello\",\"bye\") }");
- assertEval(Output.ContainsWarning, "{ c(1+1i,2+2i) == c(2+1i,1+2i,1+1i) }");
- assertEval(Output.ContainsWarning, "{ c(2+1i,1+2i,1+1i) == c(1+1i, 2+2i) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(1,2) < c(2,1,4) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(2,1,4) < c(1,2) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(1L,2L) < c(2L,1L,4L) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(2L,1L,4L) < c(1L,2L) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(TRUE,FALSE,FALSE) < c(TRUE,TRUE) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(TRUE,TRUE) == c(TRUE,FALSE,FALSE) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(1,2)) < as.raw(c(2,1,4)) }");
+ assertEval(Output.IgnoreWarningContext, "{ as.raw(c(2,1,4)) < as.raw(c(1,2)) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(\"hi\",\"hello\",\"bye\") > c(\"cau\", \"ahoj\") }");
+ assertEval(Output.IgnoreWarningContext, "{ c(\"cau\", \"ahoj\") != c(\"hi\",\"hello\",\"bye\") }");
+ assertEval(Output.IgnoreWarningContext, "{ c(1+1i,2+2i) == c(2+1i,1+2i,1+1i) }");
+ assertEval(Output.IgnoreWarningContext, "{ c(2+1i,1+2i,1+1i) == c(1+1i, 2+2i) }");
assertEval("{ as.raw(c(2,1,4)) < raw() }");
assertEval("{ raw() < as.raw(c(2,1,4)) }");
@@ -255,7 +255,7 @@ public class TestSimpleComparison extends TestBase {
assertEval("{ c(0/0+1i,2+1i) == c(1+1i,2+1i) }");
assertEval("{ c(1+1i,2+1i) == c(0/0+1i,2+1i) }");
- assertEval(Output.ContainsError, "{ m <- matrix(nrow=2, ncol=2, 1:4) ; m == 1:16 }");
+ assertEval(Output.IgnoreErrorContext, "{ m <- matrix(nrow=2, ncol=2, 1:4) ; m == 1:16 }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java
index 1c575f3c63..44de44352d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleDataFrames.java
@@ -71,8 +71,8 @@ public class TestSimpleDataFrames extends TestBase {
assertEval("{ x<-c(1,2); dim(x)<-c(1,2); dimnames(x)<-list(1.1, c(2.2, 3.3)); row.names(x)<-NULL; row.names(x) }");
assertEval("{ x<-c(1,2); dim(x)<-c(1,2); dimnames(x)<-list(1.1, c(2.2, 3.3)); row.names(x)<-logical(); attributes(x) }");
assertEval("{ x<-c(1,2); dim(x)<-c(1,2); dimnames(x)<-list(1.1, c(2.2, 3.3)); row.names(x)<-logical(); row.names(x) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-7; attributess(x) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-7; row.names(x) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-7; attributess(x) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-7; row.names(x) }");
assertEval("{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-c(7, 42); attributes(x) }");
assertEval("{ x<-c(1,2); dim(x)<-c(2,1); dimnames(x)<-list(c(2.2, 3.3), 1.1); row.names(x)<-c(7, 42); row.names(x) }");
@@ -87,7 +87,7 @@ public class TestSimpleDataFrames extends TestBase {
public void testAsDataFrame() {
assertEval("{ x<-list(1,2); class(x)<-\"data.frame\"; row.names(x)<-\"r1\"; y<-as.data.frame(x, \"r2\"); attributes(x) }");
assertEval("{ x<-list(1,2); class(x)<-\"data.frame\"; row.names(x)<-\"r1\"; y<-as.data.frame(x, \"r2\"); attributes(y) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2); class(x)<-\"data.frame\"; row.names(x)<-\"r1\"; y<-as.data.frame(x, c(\"r1\", \"r2\")); attributes(y) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2); class(x)<-\"data.frame\"; row.names(x)<-\"r1\"; y<-as.data.frame(x, c(\"r1\", \"r2\")); attributes(y) }");
assertEval("{ x<-c(7L,42L); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); attributes(y); }");
assertEval("{ x<-as.double(c(7L,42L)); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); attributes(y); }");
assertEval("{ x<-as.logical(c(7L,42L)); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); attributes(y); }");
@@ -100,12 +100,12 @@ public class TestSimpleDataFrames extends TestBase {
assertEval("{ x<-as.character(c(7L,42L)); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); is.data.frame(y); }");
assertEval("{ x<-as.complex(c(7L,42L)); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); is.data.frame(y); }");
assertEval("{ x<-as.raw(c(7L,42L)); y<-as.data.frame(x, row.names=NULL, nm=\"x\"); is.data.frame(y); }");
- assertEval(Output.ContainsWarning, "{ x<-c(7L,42L); y<-as.data.frame(x, row.names=\"r1\", nm=\"x\"); attributes(y); }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-c(7L,42L); y<-as.data.frame(x, row.names=\"r1\", nm=\"x\"); attributes(y); }");
assertEval("{ x<-c(7L,42L); y<-as.data.frame(x, row.names=c(\"r1\", \"r2\"), nm=\"x\"); attributes(y); }");
- assertEval(Output.ContainsWarning, "{ x<-c(7L,42L); y<-as.data.frame(x, row.names=c(\"r1\", \"r2\", \"r3\"), nm=\"x\"); attributes(y); }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-c(7L,42L); y<-as.data.frame(x, row.names=c(\"r1\", \"r2\", \"r3\"), nm=\"x\"); attributes(y); }");
assertEval("{ x<-matrix(c(1,2,3,4), nrow=2); y<-as.data.frame(x, row.names=NULL, optional=FALSE); attributes(y); }");
assertEval("{ x<-matrix(c(1,2,3,4), nrow=2); y<-as.data.frame(x, row.names=\"r1\", optional=FALSE); attributes(y); }");
- assertEval(Output.ContainsError, "{ x<-1; class(x)<-\"foo\"; y<-as.data.frame(x) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1; class(x)<-\"foo\"; y<-as.data.frame(x) }");
}
@Test
@@ -175,7 +175,7 @@ public class TestSimpleDataFrames extends TestBase {
public void testMisc() {
assertEval("{ y<-data.frame(7); as.logical(y) }");
assertEval("{ y<-data.frame(integer()); as.logical(y) }");
- assertEval(Output.ContainsError, "{ y<-data.frame(c(1,2,3)); as.logical(y) }");
+ assertEval(Output.IgnoreErrorContext, "{ y<-data.frame(c(1,2,3)); as.logical(y) }");
assertEval("{ y<-data.frame(c(1,2,3)); length(y) }");
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleIfEvaluator.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleIfEvaluator.java
index 29916d0e1f..9ed8cb3b99 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleIfEvaluator.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleIfEvaluator.java
@@ -51,45 +51,45 @@ public class TestSimpleIfEvaluator extends TestBase {
@Test
public void testIf() {
assertEval("{ x <- 2 ; if (1==x) TRUE else 2 }");
- assertEval(Output.ContainsError, "{ x <- 2 ; if (NA) x <- 3 ; x }");
- assertEval(Output.ContainsError, "{ f <- function(x) { if (x) 1 else 2 } ; f(NA) }");
- assertEval(Output.ContainsError, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(NA) }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- 2 ; if (NA) x <- 3 ; x }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { if (x) 1 else 2 } ; f(NA) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(NA) }");
assertEval("{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(TRUE) }");
assertEval("{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(FALSE) }");
- assertEval(Output.ContainsError, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(\"hello\") }");
- assertEval(Output.ContainsError, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(logical()) }");
- assertEval(Output.ContainsError, "{ f <- function(x) { if (x == 2) 1 else 2 } ; f(1) ; f(NA) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(\"hello\") }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(logical()) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(x) { if (x == 2) 1 else 2 } ; f(1) ; f(NA) }");
assertEval("{ if (TRUE==FALSE) TRUE else FALSE }");
- assertEval(Output.ContainsError, "{ if (NA == TRUE) TRUE else FALSE }");
- assertEval(Output.ContainsError, "{ if (TRUE == NA) TRUE else FALSE }");
+ assertEval(Output.IgnoreErrorContext, "{ if (NA == TRUE) TRUE else FALSE }");
+ assertEval(Output.IgnoreErrorContext, "{ if (TRUE == NA) TRUE else FALSE }");
assertEval("{ if (FALSE==TRUE) TRUE else FALSE }");
assertEval("{ if (FALSE==1) TRUE else FALSE }");
assertEval("{ f <- function(v) { if (FALSE==v) TRUE else FALSE } ; f(TRUE) ; f(1) }");
- assertEval(Output.ContainsError, Output.ContainsWarning, "{ x<-list(1,2); if (x) 7 else 42 }");
+ assertEval(Output.IgnoreErrorContext, Output.IgnoreWarningContext, "{ x<-list(1,2); if (x) 7 else 42 }");
assertEval("{ if (!(7+42i)) TRUE else FALSE }");
}
@Test
public void testIfIgnore() {
- assertEval(Output.ContainsWarning, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(1:3) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(x) { if (x) 1 else 2 } ; f(1) ; f(1:3) }");
}
@Test
public void testCast() {
- assertEval(Output.ContainsWarning, "{ f <- function(a) { if (is.na(a)) { 1 } else { 2 } } ; f(5) ; f(1:3)}");
- assertEval(Output.ContainsWarning, "{ if (1:3) { TRUE } }");
- assertEval(Output.ContainsError, "{ if (integer()) { TRUE } }");
- assertEval(Output.ContainsError, "{ if (1[2:1]) { TRUE } }");
- assertEval(Output.ContainsWarning, "{ if (c(0,0,0)) { TRUE } else { 2 } }");
- assertEval(Output.ContainsWarning, "{ if (c(1L,0L,0L)) { TRUE } else { 2 } }");
- assertEval(Output.ContainsWarning, "{ if (c(0L,0L,0L)) { TRUE } else { 2 } }");
- assertEval(Output.ContainsError, "{ if (c(1L[2],0L,0L)) { TRUE } else { 2 } }");
- assertEval(Output.ContainsWarning, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(1:3) ; f(2) }");
- assertEval(Output.ContainsWarning, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(c(TRUE,FALSE)) ; f(FALSE) }");
- assertEval(Output.ContainsError, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(logical()) }");
- assertEval(Output.ContainsWarning, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(c(TRUE,FALSE)) ; f(1) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(a) { if (is.na(a)) { 1 } else { 2 } } ; f(5) ; f(1:3)}");
+ assertEval(Output.IgnoreWarningContext, "{ if (1:3) { TRUE } }");
+ assertEval(Output.IgnoreErrorContext, "{ if (integer()) { TRUE } }");
+ assertEval(Output.IgnoreErrorContext, "{ if (1[2:1]) { TRUE } }");
+ assertEval(Output.IgnoreWarningContext, "{ if (c(0,0,0)) { TRUE } else { 2 } }");
+ assertEval(Output.IgnoreWarningContext, "{ if (c(1L,0L,0L)) { TRUE } else { 2 } }");
+ assertEval(Output.IgnoreWarningContext, "{ if (c(0L,0L,0L)) { TRUE } else { 2 } }");
+ assertEval(Output.IgnoreErrorContext, "{ if (c(1L[2],0L,0L)) { TRUE } else { 2 } }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(1:3) ; f(2) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(c(TRUE,FALSE)) ; f(FALSE) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(logical()) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(cond) { if (cond) { TRUE } else { 2 } } ; f(c(TRUE,FALSE)) ; f(1) }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLoop.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLoop.java
index 97aa875ce3..15e11180f0 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLoop.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleLoop.java
@@ -49,7 +49,7 @@ public class TestSimpleLoop extends TestBase {
@Test
public void testLoopsErrors() {
- assertEval(Output.ContainsError, "{ while (1 < NA) { 1 } }");
+ assertEval(Output.IgnoreErrorContext, "{ while (1 < NA) { 1 } }");
assertEval("{ break; }");
assertEval("{ next; }");
@@ -61,9 +61,9 @@ public class TestSimpleLoop extends TestBase {
@Test
public void testLoopsErrorsIgnore() {
- assertEval(Ignored.Unknown, Output.ContainsError, "{ l <- quote(for(i in s) { x <- i }) ; s <- 1:3 ; eval(l) ; s <- function(){} ; eval(l) ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ l <- function(s) { for(i in s) { x <- i } ; x } ; l(1:3) ; s <- function(){} ; l(s) ; x }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ l <- quote({ for(i in s) { x <- i } ; x }) ; f <- function(s) { eval(l) } ; f(1:3) ; s <- function(){} ; f(s) ; x }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ l <- quote(for(i in s) { x <- i }) ; s <- 1:3 ; eval(l) ; s <- function(){} ; eval(l) ; x }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ l <- function(s) { for(i in s) { x <- i } ; x } ; l(1:3) ; s <- function(){} ; l(s) ; x }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ l <- quote({ for(i in s) { x <- i } ; x }) ; f <- function(s) { eval(l) } ; f(1:3) ; s <- function(){} ; f(s) ; x }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleSequences.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleSequences.java
index 6315730efe..5687355087 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleSequences.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleSequences.java
@@ -54,8 +54,8 @@ public class TestSimpleSequences extends TestBase {
assertEval("{ 1:(1:3) }");
// these two test need proper handling of parentheses
- assertEval(Output.ContainsWarning, "{ (1:3):3 }");
- assertEval(Output.ContainsWarning, "{ (1:3):(1:3) }");
+ assertEval(Output.IgnoreWarningContext, "{ (1:3):3 }");
+ assertEval(Output.IgnoreWarningContext, "{ (1:3):(1:3) }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleTruffle.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleTruffle.java
index 88f2f6aff3..75b2a0d373 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleTruffle.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleTruffle.java
@@ -53,7 +53,7 @@ public class TestSimpleTruffle extends TestBase {
@Test
public void testWarningsAndErrors() {
assertEval("{ (c(1, 2) < c(1, 2, 3)) == (c(1, 2) < c(1, 3, 4)) }");
- assertEval(Output.ContainsError, Output.ContainsWarning, "{ 1i > (c(1, 2) < c(1, 2, 3)) }");
+ assertEval(Output.IgnoreErrorContext, Output.IgnoreWarningContext, "{ 1i > (c(1, 2) < c(1, 2, 3)) }");
assertEval("{ 1i > ((c(1, 2) < c(1, 2, 3)) == (c(1, 2) < c(1, 3, 4))) }");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleValues.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleValues.java
index 39b6304242..3a1e5db94a 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleValues.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleValues.java
@@ -82,7 +82,7 @@ public class TestSimpleValues extends TestBase {
@Test
public void testUnaryBuiltings() {
- assertEval(Output.MayContainError, template("%0(%1)", UNARY_BUILTINS, ALL_ARITHMETIC_VALUES));
+ assertEval(Output.MayIgnoreErrorContext, template("%0(%1)", UNARY_BUILTINS, ALL_ARITHMETIC_VALUES));
}
private static final String[] SUBSCRIPT_SEQUENCE_VALUES = {"1:1", "2:4", "4:2"};
@@ -131,7 +131,7 @@ public class TestSimpleValues extends TestBase {
@Test
public void testVectorAccess() {
- assertEval(Output.MayContainError, template("x <- %1; x[%0]", SUBSCRIPT_ALL_VALUES, TESTED_VECTORS));
+ assertEval(Output.MayIgnoreErrorContext, template("x <- %1; x[%0]", SUBSCRIPT_ALL_VALUES, TESTED_VECTORS));
}
@Test
@@ -141,7 +141,7 @@ public class TestSimpleValues extends TestBase {
assertEval("v <- double(5) ; v[[3]] <- c(1) ; v");
assertEval("v <- double(5) ; v[[3]] <- matrix(c(1)) ; v");
// TODO(tw): Expand this test.
- assertEval(Output.MayContainError, Output.MayContainWarning,
+ assertEval(Output.MayIgnoreErrorContext, Output.MayIgnoreWarningContext,
template("{ x <- %2; x[%0] <- %1; x }", join(SUBSCRIPT_VECTOR_THREE_VALUES, SUBSCRIPT_SEQUENCE_VALUES), INT_UPDATE_VALUES, TESTED_VECTORS));
}
@@ -172,7 +172,7 @@ public class TestSimpleValues extends TestBase {
@Test
public void testBinaryArithmetic() {
assertEval("FALSE^(-3)");
- assertEval(Output.MayContainError, BINARY_ARITHMETIC_WHITELIST, template("%0%1%2", ALL_ARITHMETIC_VALUES, BINARY_OPERATORS, ALL_ARITHMETIC_VALUES));
+ assertEval(Output.MayIgnoreErrorContext, BINARY_ARITHMETIC_WHITELIST, template("%0%1%2", ALL_ARITHMETIC_VALUES, BINARY_OPERATORS, ALL_ARITHMETIC_VALUES));
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java
index e84dfe3f57..a02b5b544d 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/base/TestSimpleVectors.java
@@ -38,7 +38,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(7,42); `[<-`(x, 1, 7); }");
assertEval("{ x<-c(7,42); `[[<-`(x, 1, 7); }");
assertEval("{ x<-c(7,42); `[<-`(x, 1); }");
- assertEval(Output.ContainsError, "{ x<-c(7,42); `[[<-`(x, 1); }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(7,42); `[[<-`(x, 1); }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); `[<-`(x, 3, value=\"b\") }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); `[[<-`(x, 3, value=\"b\") }");
@@ -61,7 +61,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); x[[3]] }");
assertEval("{ x<-factor(c(\"a\", zz=\"b\", \"a\")); x[[\"z\", exact=FALSE]] }");
- assertEval(Output.ContainsError, "{ x<-factor(c(\"a\", zz=\"b\", \"a\")); x[[\"z\", exact=TRUE]] }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-factor(c(\"a\", zz=\"b\", \"a\")); x[[\"z\", exact=TRUE]] }");
assertEval("{ x<-data.frame(1,2); x[2]<-7; x }");
assertEval("{ x<-data.frame(1,2); x[[2]]<-7; x }");
@@ -83,7 +83,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); `[[.factor`(x, 1) }");
assertEval("{ x<-factor(c(\"a\", z=\"b\", \"a\")); `[[.factor`(x, \"z\") }");
- assertEval(Output.ContainsError, "{ x<-factor(c(\"a\", zz=\"b\", \"a\")); `[[.factor`(x, \"z\", exact=TRUE) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-factor(c(\"a\", zz=\"b\", \"a\")); `[[.factor`(x, \"z\", exact=TRUE) }");
assertEval("{ x<-factor(c(\"a\", zz=\"b\", \"a\")); `[[.factor`(x, \"z\", exact=FALSE) }");
assertEval("{ x<-factor(c(\"a\", \"b\", \"a\")); `[`(x, 1) }");
@@ -284,7 +284,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(1,2); x[[c(\"a\", \"b\")]] }");
assertEval("{ x<-1:2; x[c(TRUE, TRUE)] }");
assertEval("{ x<-1:2; x[[c(TRUE, TRUE)]] }");
- assertEval(Output.ContainsError, "{ x<-1:2; dim(x)<-c(1,2); x[2+2i, 2+2i] }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:2; dim(x)<-c(1,2); x[2+2i, 2+2i] }");
assertEval("{ x<-1:2; dim(x)<-c(1,2); u<-2+2i; x[[u, u]] }");
assertEval("{ x<-2; x[NULL] }");
assertEval("{ x<-2; x[[NULL]] }");
@@ -307,11 +307,11 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-as.integer(1:4); x[[as.integer(NA)]] }");
assertEval("{ x<-as.integer(1:4); dim(x)<-c(2,2); x[[as.integer(NA)]] }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[0,0]<-integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[0, 0]] <- integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[-1, 0]] <- integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[0, -1]] <- integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[-5, 0]] <- integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[0, -5]] <- integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[0, 0]] <- integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[-1, 0]] <- integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[0, -1]] <- integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[-5, 0]] <- integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[0, -5]] <- integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[-1,0]<-integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[0,-1]<-integer(); x }");
@@ -356,7 +356,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(a=1, b=2); x[1] }");
assertEval("{ x<-c(a=1, b=2); x[[1]] }");
// GnuR says "attempt to select less than one element", FastR says "... more ..."
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:8; dim(x)<-c(2,2,2); x[[-3, 1, 1]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:8; dim(x)<-c(2,2,2); x[[-3, 1, 1]] }");
assertEval("{ x<-list(1); x[\"y\"] }");
assertEval("{ x<-list(1); x[[\"y\"]] }");
@@ -368,24 +368,24 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(a=list(42)); x[[c(\"a\", \"y\")]] }");
assertEval("{ x<-list(a=list(b=42)); x[[c(\"a\", \"b\")]] }");
- assertEval(Output.ContainsAmbiguousError, "{ l<-list(1,2,3,4); l[[c(NA,1)]]<-c(1); l }");
+ assertEval(Output.IgnoreErrorMessage, "{ l<-list(1,2,3,4); l[[c(NA,1)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(1,NA)]]<-c(1); l }");
- assertEval(Output.ContainsError, "{ l<-list(1,2,3,4); l[[c(7,1)]]<-c(1); l }");
+ assertEval(Output.IgnoreErrorContext, "{ l<-list(1,2,3,4); l[[c(7,1)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(NA)]]<-c(1); l }");
- assertEval(Output.ContainsAmbiguousError, "{ l<-list(1,2,3,4); l[[c(NA,1)]]<-c(-1); l }");
+ assertEval(Output.IgnoreErrorMessage, "{ l<-list(1,2,3,4); l[[c(NA,1)]]<-c(-1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(-1)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(-1,1)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(0)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(0,1)]]<-c(1); l }");
- assertEval(Output.ContainsError, "{ l<-list(1,2,3,4); l[[c(1,1,1)]]<-c(1); l }");
+ assertEval(Output.IgnoreErrorContext, "{ l<-list(1,2,3,4); l[[c(1,1,1)]]<-c(1); l }");
assertEval("{ l<-list(list(1),2,3,4); l[[c(1,1,NA)]]<-c(1); l }");
assertEval("{ l<-list(1,2,3,4); l[[c(2,1)]]<-7; l }");
assertEval("{ l<-list(1,2,3,4); l[c(2,1)]<-7; l }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; x[1]<-c(1,1); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; x[1]<-c(1,1); x }");
assertEval("{ x<-1:4; x[[1]]<-c(1,1); x }");
assertEval("{ x<-1; x[0]<-integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1; x[[0]]<-integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1; x[[0]]<-integer(); x }");
assertEval("{ x<-1; x[1]<-integer(); x }");
assertEval("{ x<-1; x[]<-42; x }");
assertEval("{ x<-1; x[[]]<-42; x }");
@@ -394,72 +394,72 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-7; x[NULL]<-42; x }");
assertEval("{ x<-7; x[0]<-42; x }");
assertEval("{ x<-7; x[[NA]]<-42; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-7; x[[NA]]<-c(42, 7); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-7; x[[NA]]<-c(42, 7); x }");
assertEval("{ x<-7; x[[NULL]]<-42; x }");
assertEval("{ x<-7; x[[0]]<-42; x }");
assertEval("{ x<-1:4; x[c(1, 0)]<-42; x }");
assertEval("{ x<-1:4; x[c(0, 1)]<-42; x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; x[c(1, 0)]<-c(7, 42); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; x[c(0, 1)]<-c(7, 42); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; x[c(1, 0)]<-c(7, 42); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; x[c(0, 1)]<-c(7, 42); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[NULL]<-42; x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[NA]<-42; x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[0]<-42; x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(1,4)]<-c(42, 43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,4)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,4)]]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(1,NA)]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(NA,1)]<-c(42, 43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,0)]]<-c(42, 43); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; dim(x)<-c(2,2); x[c(1,0)]<-c(42, 43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,0,0)]]<-c(42, 43); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; dim(x)<-c(2,2); x[c(1,0,0)]<-c(42, 43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,1,0)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,0)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(1,0)]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,0,0)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(1,0,0)]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1,1,0)]]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(1,1,0)]<-c(42, 43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,1)]]<-c(42, 43); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,1)]<-c(42, 43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,1)]]<-c(42, 43); x }");
- assertEval(Output.ContainsWarning, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,0,1)]<-c(42, 43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,1,1)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,1)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,1)]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,1)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,0,1)]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,1,1)]]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(0,1,1)]<-c(42, 43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0)]]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(0,0)]<-c(42, 43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,0)]]<-c(42, 43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,0)]]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(0,0,0)]<-c(42, 43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[[c(FALSE,TRUE)]]<-c(42,43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(FALSE,TRUE,TRUE)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[complex()]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-integer(); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-c(42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i,42+7i,3+3i)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,42+7i)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-integer(); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-c(42); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(FALSE,TRUE,TRUE)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[complex()]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-integer(); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-c(42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(1+1i,42+7i,3+3i)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,42+7i)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-integer(); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-c(42); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[complex()]<-c(42,43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-c(42,43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i,42+7i,3+3i)]<-c(42,43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,42+7i)]<-c(42,43); x }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,42+71)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(integer()))]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42))]]<-integer(); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i)]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(1+1i,42+7i,3+3i)]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[c(0,42+7i)]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[c(0,0,42+71)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(integer()))]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42))]]<-integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42))]]<-c(43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42))]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42), as.raw(7))]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42), as.raw(7), as.raw(1))]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42))]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42), as.raw(7))]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[c(as.raw(42), as.raw(7), as.raw(1))]]<-c(42,43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(integer()))]<-c(42,43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(42))]<-integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(42))]<-c(43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(42))]<-c(42,43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(42), as.raw(7))]<-c(42,43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[c(as.raw(42), as.raw(7), as.raw(1))]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-integer(); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-c(42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1)]]<-integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-c(42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list()]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1)]]<-integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[[list(1)]]<-c(42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3)]]<-c(42,43); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[list()]<-integer(); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3)]]<-c(42,43); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[list()]<-integer(); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list()]<-c(42); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list()]<-c(42,43); x }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list(1)]<-integer(); x }");
@@ -485,7 +485,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ n<-1; n[7]<-42; n }");
assertEval("{ n<-1; n[[7]]<-42; n }");
assertEval("{ n<-1; n[c(7,8)]<-c(42,43); n }");
- assertEval(Output.ContainsError, "{ n<-1; n[[c(7,8)]]<-c(42,43); n }");
+ assertEval(Output.IgnoreErrorContext, "{ n<-1; n[[c(7,8)]]<-c(42,43); n }");
assertEval("{ x<-NULL; x[1]<-42; x }");
assertEval("{ x<-NULL; x[1]<-42+7i; x }");
assertEval("{ x<-NULL; x[7]<-42; x }");
@@ -508,7 +508,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- NULL; x[c(\"a\", as.character(NA), as.character(NA))] <- 7; x }");
assertEval("{ b<-3:5; dim(b) <- c(1,3) ; b[] <- NULL ; b }");
assertEval("{ b<-3:5; dim(b) <- c(1,3) ; b[c(FALSE, FALSE, FALSE)] <- NULL ; b }");
- assertEval(Output.ContainsError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
+ assertEval(Output.IgnoreErrorContext, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
assertEval("{ b<-3:5; dim(b) <- c(1,3) ; b[c(1,2)] <- NULL ; b }");
assertEval("{ b<-3:5; dim(b) <- c(1,3) ; b[c(1)] <- NULL ; b }");
assertEval("{ b<-3:5; dim(b) <- c(1,3) ; b[0] <- NULL ; b }");
@@ -521,9 +521,9 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(list(1,list(42))); x[[c(1, 2)]]<-7; x }");
assertEval("{ x<-list(list(1,list(42,list(143)))); x[[c(1, 2, 2)]]<-7; x }");
assertEval("{ x<-list(list(1,list(42,list(143)))); x[[c(1, 2, 7)]]<-7; x }");
- assertEval(Output.ContainsError, "{ x<-list(list(1,list(42,list(143)))); x[[c(1, 2, 7, 7)]]<-7; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(list(1,list(42,list(143)))); x[[c(1, 2, 7, 7)]]<-7; x }");
assertEval("{ x<-list(list(1,list(42,list(list(143))))); x[[c(1, 2, 2, 1)]]<-7; x }");
- assertEval(Output.ContainsError, "{ x<-list(list(1,list(42,list(list(143))))); x[[c(1, NA, 2, 1)]]<-7; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(list(1,list(42,list(list(143))))); x[[c(1, NA, 2, 1)]]<-7; x }");
assertEval("{ x<-list(list(1,list(42,list(list(143))))); x[[c(1, 2, 2, NA)]]<-7; x }");
assertEval("{ x<-list(1, list(42)); x[[c(-3, 1)]]<-7; x }");
assertEval("{ x<-list(1, 2, list(42)); x[[c(-1, 1)]]<-7; x }");
@@ -617,7 +617,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-matrix(1:4, ncol=2, dimnames=list(m=c(\"a\", \"b\"), n=c(\"c\", \"d\"))); dimnames(x)$m[1]<-\"z\"; x }");
- assertEval(Output.ContainsError, "{ x<-c(aa=1, b=2); dim(x)<-c(1,2); x[\"a\", exact=FALSE]<-7; x }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(aa=1, b=2); dim(x)<-c(1,2); x[\"a\", exact=FALSE]<-7; x }");
assertEval("{ f<-function(v, ...) v[...]; x<-matrix(1:4, ncol=2); f(x, 1, 2) }");
assertEval("{ f<-function(v, i, ...) v[i, ...]; x<-matrix(1:4, ncol=2); f(x, 1, 2) }");
@@ -632,8 +632,8 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(data=list(matrix(1:4, ncol=2))); x$data[[1]][2,2]<-42; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; x[[1]]<-NULL; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; x[[1]]<-NULL; x }");
assertEval("{ f<-function(x,y) sys.call(); x<-f(7, 42); x[c(1,2)] }");
assertEval("{ f<-function(x,y) sys.call(); x<-f(7, 42); typeof(x[c(1,2)]) }");
@@ -648,24 +648,24 @@ public class TestSimpleVectors extends TestBase {
* or some type-error, e.g. "incompatible types (from NULL to double) in [[ assignment". We
* could address this with a whitelist.
*/
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1,1]]<-NULL; x }");
- assertEval(Output.ContainsAmbiguousError, "{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3); x[[-4]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1,1]]<-NULL; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ b<-as.list(3:5); dim(b) <- c(1,3) ; b[[c(1,2)]] <- NULL ; b }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3); x[[-4]]<-NULL }");
// this came from testRawIndex
// weird problems with fluctuating error messages in GNU R
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; x[[0]]<-NULL; x }");
- assertEval(Output.ContainsAmbiguousError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1)]] <- NULL ; b }");
- assertEval(Output.ContainsAmbiguousError, "{ b<-3:5; dim(b) <- c(1,3) ; b[[0]] <- NULL ; b }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- integer() ; x[[NA]] <- NULL ; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- c(1) ; x[[NA]] <- NULL ; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- c(1,2) ; x[[NA]] <- NULL ; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- c(1,2,3) ; x[[NA]] <- NULL ; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1]]<-NULL; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; x[[0]]<-NULL; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ b<-3:5; dim(b) <- c(1,3) ; b[[c(1)]] <- NULL ; b }");
+ assertEval(Output.IgnoreErrorMessage, "{ b<-3:5; dim(b) <- c(1,3) ; b[[0]] <- NULL ; b }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- integer() ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- c(1) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- c(1,2) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- c(1,2,3) ; x[[NA]] <- NULL ; x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1]]<-NULL; x }");
// inconsistent error messages in expected output and shell
- assertEval(Output.ContainsAmbiguousError, "{ x <- c(1); x[[-4]] <- NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- c(1,2,3); x[[-1]] <- NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- c(1); x[[-4]] <- NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- c(1,2,3); x[[-1]] <- NULL }");
assertEval("{ x<-emptyenv(); y<-list(); y[[1]]<-x; y[[1]] }");
assertEval("{ f<-function() 42; y<-list(); y[[1]]<-f; y[[1]] }");
@@ -721,9 +721,9 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[NA]<-7; x }");
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-7; x }");
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[NA]<-c(7,42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-c(7, 42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-c(7, 42); x }");
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[NA]<-c(7, 42, 1); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-c(7, 42, 1); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-c(7, 42, 1); x }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[NA]<-7; x }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[NA]]<-7; x }");
@@ -741,12 +741,12 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, NA]]<-7; x }");
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1, NA]]<-7; x }");
assertEval("{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, 1]]<-7; x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, NA]]<-c(7, 42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1, NA]]<-c(7, 42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, 1]]<-c(7, 42); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, NA]]<-c(7, 42, 1); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1, NA]]<-c(7, 42, 1); x }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, 1]]<-c(7, 42, 1); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, NA]]<-c(7, 42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1, NA]]<-c(7, 42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, 1]]<-c(7, 42); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, NA]]<-c(7, 42, 1); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1, NA]]<-c(7, 42, 1); x }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[NA, 1]]<-c(7, 42, 1); x }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[NA, NA]<-7; x }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1, NA]<-7; x }");
@@ -770,69 +770,69 @@ public class TestSimpleVectors extends TestBase {
@Test
public void testComplexIndex() {
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[1+1i]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1,2) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1,2,3) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[1+1i]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[1+1i]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[1+1i]<-c(1) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[1+1i]<-c(1,2) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); x[1+1i]<-c(1,2,3) }");
-
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-c(7,42) }");
-
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[[1+1i]]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[[1+1i]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1,2) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1,2,3) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[1+1i]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[1+1i]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[1+1i]<-c(1) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[1+1i]<-c(1,2) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); x[1+1i]<-c(1,2,3) }");
-
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[1+1i]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1,2) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[1+1i]]<-c(1,2,3) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[1+1i]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[1+1i]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[1+1i]<-c(1) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[1+1i]<-c(1,2) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[1+1i]<-c(1,2,3) }");
+
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-c(7,42) }");
+
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[[1+1i]]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[[1+1i]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1,2) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[[1+1i]]<-c(1,2,3) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[1+1i]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[1+1i]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[1+1i]<-c(1) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[1+1i]<-c(1,2) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); x[1+1i]<-c(1,2,3) }");
+
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-c(7,42) }");
// weird fluctuating error messages in GNUR
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-c(1,2,3,4); x[[1+1i]]<-NULL }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-NULL }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-NULL }");
+ assertEval(Ignored.Unstable, Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); x[[1+1i]]<-NULL }");
+ assertEval(Ignored.Unstable, Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[1+1i, 1]<-NULL }");
+ assertEval(Ignored.Unstable, Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[1+1i, 1]]<-NULL }");
}
@Test
public void testRawIndex() {
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-integer() }");
assertEval("{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1,2) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1,2,3) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1,2) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); x[[as.raw(1)]]<-c(1,2,3) }");
assertEval("{ x<-c(1,2,3,4); x[as.raw(1)]<-NULL }");
assertEval("{ x<-c(1,2,3,4); x[as.raw(1)]<-integer() }");
assertEval("{ x<-c(1,2,3,4); x[as.raw(1)]<-c(1) }");
assertEval("{ x<-c(1,2,3,4); x[as.raw(1)]<-c(1,2) }");
assertEval("{ x<-c(1,2,3,4); x[as.raw(1)]<-c(1,2,3) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-c(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-c(7,42) }");
assertEval("{ x<-list(1,2,3,4); x[[as.raw(1)]]<-NULL }");
assertEval("{ x<-list(1,2,3,4); x[[as.raw(1)]]<-integer() }");
@@ -845,14 +845,14 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(1,2,3,4); x[as.raw(1)]<-c(1,2) }");
assertEval("{ x<-list(1,2,3,4); x[as.raw(1)]<-c(1,2,3) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[as.raw(1), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[as.raw(1), 1]<-c(7,42) }");
}
@@ -870,17 +870,17 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ z<-1:4; z[list(1)]<-NULL }");
assertEval("{ z<-1:4; z[list(1,2)]<-NULL }");
assertEval("{ z<-1:4; z[list(1,2,3)]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list()]]<-42 }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list()]]<-42 }");
assertEval("{ z<-1:4; z[[list(1)]]<-42 }");
assertEval("{ z<-1:4; z[[list(1,2)]]<-42 }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2,3)]]<-42 }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list()]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1)]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2)]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2,3)]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1)]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2)]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2,3)]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2,3)]]<-42 }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list()]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1)]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2)]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2,3)]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1)]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2)]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2,3)]]<-NULL }");
assertEval("{ z<-list(1,2,3,4); z[list()]<-42 }");
assertEval("{ z<-list(1,2,3,4); z[list(1)]<-42 }");
@@ -894,76 +894,76 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ z<-list(1,2,3,4); z[list(1)]<-NULL }");
assertEval("{ z<-list(1,2,3,4); z[list(1,2)]<-NULL }");
assertEval("{ z<-list(1,2,3,4); z[list(1,2,3)]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-list(1,2,3,4); z[[list()]]<-42 }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-list(1,2,3,4); z[[list()]]<-42 }");
assertEval("{ z<-list(1,2,3,4); z[[list(1)]]<-42 }");
assertEval("{ z<-list(1,2,3,4); z[[list(1,2)]]<-42 }");
- assertEval(Output.ContainsError, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-42 }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-list(1,2,3,4); z[[list()]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-42 }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-list(1,2,3,4); z[[list()]]<-integer() }");
assertEval("{ z<-list(1,2,3,4); z[[list(1)]]<-integer() }");
assertEval("{ z<-list(1,2,3,4); z[[list(1,2)]]<-integer() }");
- assertEval(Output.ContainsError, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-list(1,2,3,4); z[[list()]]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-list(1,2,3,4); z[[list()]]<-NULL }");
assertEval("{ z<-list(1,2,3,4); z[[list(1)]]<-NULL }");
assertEval("{ z<-list(1,2,3,4); z[[list(1,2)]]<-NULL }");
- assertEval(Output.ContainsError, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-NULL }");
-
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-c(7,42) }");
-
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-c(7,42) }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-NULL }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-integer() }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-7 }");
- assertEval(Output.ContainsError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-c(7,42) }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-NULL }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-integer() }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-7 }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ z<-list(1,2,3,4); z[[list(1,2,3)]]<-NULL }");
+
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[list(1,2,3), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-c(7,42) }");
+
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2,3), 1]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorContext, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]]<-c(7,42) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-NULL }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-integer() }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-7 }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2,3), 1]]<-c(7,42) }");
assertEval("{ z<-1:4; z[list()] }");
assertEval("{ z<-1:4; z[list(1)] }");
@@ -971,12 +971,12 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list(), 1] }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list(1), 1] }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[list(1,2), 1] }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list()]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list()]] }");
assertEval("{ z<-1:4; z[[list(1)]] }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-1:4; z[[list(1,2)]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-1:4; z[[list(1,2)]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(), 1]] }");
assertEval("{ x<-1:4; dim(x)<-c(2,2); x[[list(1), 1]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-1:4; dim(x)<-c(2,2); x[[list(1,2), 1]] }");
assertEval("{ z<-list(1,2,3,4); z[list()] }");
assertEval("{ z<-list(1,2,3,4); z[list(1)] }");
@@ -984,14 +984,14 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(), 1] }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1), 1] }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[list(1,2), 1] }");
- assertEval(Output.ContainsAmbiguousError, "{ z<-list(1,2,3,4); z[[list()]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ z<-list(1,2,3,4); z[[list()]] }");
assertEval("{ z<-list(1,2,3,4); z[[list(1)]] }");
assertEval("{ z<-list(1,2,3,4); z[[list(1,2)]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(), 1]] }");
assertEval("{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1), 1]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x<-list(1,2,3,4); dim(x)<-c(2,2); x[[list(1,2), 1]] }");
- assertEval(Ignored.Unknown, Output.ContainsError, "{ z<-1:4; z[[list()]]<-NULL }");
+ assertEval(Ignored.Unknown, Output.IgnoreErrorContext, "{ z<-1:4; z[[list()]]<-NULL }");
}
@Test
@@ -1197,10 +1197,10 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- 1:3 ; x[[FALSE]] <- 10 ; x }");
assertEval("{ x <- 1:3 ; x[[NA]] <- 10 ; x }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, list(1), 3) }");
- assertEval(Output.ContainsAmbiguousError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, list(), 3) }");
+ assertEval(Output.IgnoreErrorMessage, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, list(), 3) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, 1+2i, 3) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, 1, 3:4) }");
- assertEval(Output.ContainsAmbiguousError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, as.integer(NA), 3:4) }");
+ assertEval(Output.IgnoreErrorMessage, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:3, 1L, 10) ; f(c(1,2), \"hello\", TRUE) ; f(1:2, as.integer(NA), 3:4) }");
assertEval("{ x <- 1:2 ; x[as.integer(NA)] <- 3:4 }");
assertEval("{ b <- c(1+2i,3+4i) ; dim(b) <- c(2,1) ; b[1] <- 3+1i ; b }");
@@ -1352,12 +1352,12 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- c(a=1,b=2) ; x[[c(\"a\",\"a\")]] }");
assertEval("{ x <- list(1,2) ; x[[c(\"a\",\"a\")]] }");
assertEval("{ x <- list(a=1,b=1:3) ; x[[c(\"b\",\"a\")]] }");
- assertEval(Output.ContainsError, "{ x <- list(a=1,b=1:3) ; x[[2+3i]] }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- list(a=1,b=1:3) ; x[[2+3i]] }");
assertEval("{ x <- list(a=1,b=1:3) ; f <- function(i) { x[[i]] } ; f(c(2,2)) ; f(2+3i) }");
assertEval("{ x <- 1:3; x[list(2,3)] }");
- assertEval(Output.ContainsError, "{ x <- 1:3; x[function(){3}] }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- 1:2; x[[list()]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- 1:2; x[[list(-0,-1)]] }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- 1:3; x[function(){3}] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- 1:2; x[[list()]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- 1:2; x[[list(-0,-1)]] }");
assertEval("{ x <- 1:2; x[[list(0)]] }");
assertEval("{ f <- function(b,i) { b[[i]] } ; f(list(1,list(2)),c(2,1)) ; f(1:3,list(1)) }");
@@ -1370,10 +1370,10 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i) { b[i] } ; f(1:3, c(TRUE,FALSE,TRUE)) ; f(function(){2},3:1) }");
assertEval("{ f <- function(b,i) { b[i] } ; f(1:3, c(TRUE,FALSE)) ; f(f, c(TRUE,NA)) }");
assertEval("{ f <- function(b,i) { b[i] } ; f(1:3, c(\"h\",\"hi\")) ; f(function(){3},\"hi\") }");
- assertEval(Output.ContainsAmbiguousError, "{ f <- function(i) { l[[i]] } ; l <- list(1, f) ; f(c(2,1)) }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; x[[c(2,10)]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; x[[c(2,-3)]] }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; f <- function(i) { x[[i]] } ; f(c(\"d\",\"x\")) ; f(c(\"b\",\"z\")) }");
+ assertEval(Output.IgnoreErrorMessage, "{ f <- function(i) { l[[i]] } ; l <- list(1, f) ; f(c(2,1)) }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; x[[c(2,10)]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; x[[c(2,-3)]] }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- list(a=1,b=function(){3},d=list(x=3)) ; f <- function(i) { x[[i]] } ; f(c(\"d\",\"x\")) ; f(c(\"b\",\"z\")) }");
assertEval("{ x <- list(a=1,b=1:3) ; f <- function(i) { x[[i]] } ; f(c(2,2)) ; x <- f ; f(2+3i) }");
}
@@ -1398,7 +1398,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ b <- c(1,2) ; x <- b ; b[2L] <- 3 ; b }");
assertEval("{ b <- c(1,2) ; b[0L] <- 3 ; b }");
assertEval("{ b <- c(1,2) ; b[0] <- 1+2i ; b }");
- assertEval(Output.ContainsError, "{ x[3] <<- 10 }");
+ assertEval(Output.IgnoreErrorContext, "{ x[3] <<- 10 }");
assertEval("{ b <- c(1,2) ; b[5L] <- 3 ; b }");
assertEval("{ f <- function(b,v) { b[2] <- v ; b } ; f(c(1L,2L),10L) ; f(1,3) }");
assertEval("{ f <- function(b,v) { b[2] <- v ; b } ; f(c(1L,2L),10L) ; f(1L,3) }");
@@ -1431,8 +1431,8 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x<-c(); x[[TRUE]] <- 2; x }");
assertEval("{ x<-1:2; x[[0-2]]<-100; x }");
- assertEval(Output.ContainsError, "{ f <- function() { a[3] <- 4 } ; f() }");
- assertEval(Output.ContainsWarning, "{ b <- c(1,2) ; z <- c(10,11) ; attr(z,\"my\") <- 4 ; b[2] <- z ; b }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function() { a[3] <- 4 } ; f() }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(1,2) ; z <- c(10,11) ; attr(z,\"my\") <- 4 ; b[2] <- z ; b }");
assertEval("{ b <- c(1,2) ; z <- b ; b[-2] <- 3L ; b }");
assertEval("{ b <- c(1,2) ; z <- b ; b[-10L] <- FALSE ; b }");
assertEval("{ b <- c(TRUE,NA) ; z <- b ; b[-10L] <- FALSE ; b }");
@@ -1497,14 +1497,14 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; v } ; f(1:2,\"hi\",3L) ; f(1:2,c(2),10) ; f(1:2,as.integer(NA), 10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,c(2),10) ; f(1:2,2, 10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,c(2),10) ; f(1:2,0, 10) }");
- assertEval(Output.ContainsError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,2,10) ; f(1:2,1:3, 10) }");
- assertEval(Output.ContainsError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,2,10) ; f(as.list(1:2),1:3, 10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,2,10) ; f(1:2,1:3, 10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(1:2,\"hi\",3L) ; f(1:2,2,10) ; f(as.list(1:2),1:3, 10) }");
assertEval("{ b <- list(1+2i,3+4i) ; dim(b) <- c(2,1) ; b[3] <- NULL ; b }");
// weird problems with fluctuating error messages in GNU R
assertEval("{ f <- function(b,v) { b[[2]] <- v ; b } ; f(c(\"a\",\"b\"),\"d\") ; f(c(\"a\",\"b\"),NULL) }");
- assertEval(Ignored.Unstable, Output.ContainsError, "{ x <- 4:10 ; x[[\"z\"]] <- NULL ; x }");
+ assertEval(Ignored.Unstable, Output.IgnoreErrorContext, "{ x <- 4:10 ; x[[\"z\"]] <- NULL ; x }");
}
@Test
@@ -1624,7 +1624,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- list(); x[c('a','b')] <- list('a','b'); x }");
// negative tests
- assertEval(Output.ContainsWarning, "{ x = c(1,2,3,4); x[x %% 2 == 0] <- c(1,2,3,4); }");
+ assertEval(Output.IgnoreWarningContext, "{ x = c(1,2,3,4); x[x %% 2 == 0] <- c(1,2,3,4); }");
assertEval("{ x <- 1:3 ; x[c(-2, 1)] <- 10 }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(list(1,2), 1:2, 10) ; f(1:2, 1:2, 11) }");
@@ -1716,17 +1716,17 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ b <- 3:4 ; b[c(NA)] <- c(2,7) ; b }");
assertEval("{ b <- 3:4 ; b[c(NA,1)] <- c(2,10) ; b }");
assertEval("{ b <- 3:4 ; b[[c(NA,1)]] <- c(2,10) ; b }");
- assertEval(Output.ContainsWarning, "{ b <- 3:4 ; b[c(0,1)] <- c(2,10,11) ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- 3:4 ; b[c(0,1)] <- c(2,10,11) ; b }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(3:4, c(1,2), c(10,11)) ; f(4:5, as.integer(NA), 2) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(3:4, c(1,2), c(10,11)) ; f(4:5, c(1,-1), 2) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(3:4, c(1,2), c(10,11)) ; f(4:5, c(NA,-1), 2) }");
assertEval("{ b <- c(1,4,5) ; x <- c(2,8,2) ; b[x==2] <- c(10,11) ; b }");
assertEval("{ b <- c(1,4,5) ; z <- b ; x <- c(2,8,2) ; b[x==2] <- c(10,11) ; b }");
- assertEval(Output.ContainsWarning, "{ b <- c(1,4,5) ; x <- c(2,2) ; b[x==2] <- c(10,11) ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(1,4,5) ; x <- c(2,2) ; b[x==2] <- c(10,11) ; b }");
assertEval("{ b <- c(1,2,5) ; x <- c(2,2,NA) ; b[x==2] <- c(10,11,3) ; b }");
assertEval("{ b <- c(1,2,5) ; x <- as.double(NA) ; attr(x,\"my\") <- 2 ; b[c(1,NA,2)==2] <- x ; b }");
- assertEval(Output.ContainsWarning, "{ b <- c(1,2,5) ; x <- c(2,2,-1) ; b[x==2] <- c(10,11,5) ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(1,2,5) ; x <- c(2,2,-1) ; b[x==2] <- c(10,11,5) ; b }");
assertEval("{ b <- c(1,2,5) ; b[integer()] <- NULL ; b }");
assertEval("{ b <- c(1,2,5) ; b[c(1)] <- NULL ; b }");
@@ -1748,7 +1748,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ b <- c(1,2,5) ; b[c(TRUE,FALSE,FALSE)] <- NULL ; b }");
assertEval("{ b <- c(1,2,5) ; b[logical()] <- NULL ; b }");
- assertEval(Output.ContainsError, "{ b <- c(1,2,5) ; b[c(TRUE,NA,TRUE)] <- list(TRUE,1+2i) ; b }");
+ assertEval(Output.IgnoreErrorContext, "{ b <- c(1,2,5) ; b[c(TRUE,NA,TRUE)] <- list(TRUE,1+2i) ; b }");
assertEval("{ b <- c(1,2,5) ; b[c(TRUE,FALSE,TRUE)] <- list(TRUE,1+2i) ; b }");
assertEval("{ b <- list(1,2,5) ; dim(b) <- c(1,3) ; b[c(TRUE,FALSE,TRUE)] <- list(TRUE,1+2i) ; b }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; x <- list(1,2,5) ; dim(x) <- c(1,3) ; f(x, c(FALSE,TRUE,TRUE), list(TRUE,1+2i)) }");
@@ -1762,13 +1762,13 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(c(3+4i,5+6i), c(FALSE,TRUE,TRUE), c(NA,1+10i)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(c(TRUE,FALSE), c(FALSE,TRUE,TRUE), c(NA,2L)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), c(NA,FALSE)) }");
- assertEval(Output.ContainsWarning, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), 4:6) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), 4:6) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,c(TRUE,FALSE,TRUE),5:6) ; f(c(TRUE,TRUE,FALSE), c(FALSE,TRUE,TRUE), c(TRUE,NA)) }");
assertEval(" { f <- function(b, i, v) { b[i] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), c(NA,FALSE)) }");
- assertEval(Output.ContainsWarning, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), 4:6) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,TRUE,TRUE), 4:6) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,NA), 4) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,NA), 4:5) }");
- assertEval(Output.ContainsError, "{ f <- function(b, i, v) { b[[i]] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,NA), 4:5) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b, i, v) { b[[i]] <- v ; b } ; f(c(1,2,3),c(TRUE,FALSE,TRUE),5:6) ; f(3:5, c(FALSE,NA), 4:5) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(list(1,2), c(TRUE,FALSE), list(1+2i)) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(list(1,2), c(TRUE,FALSE), list(1+2i)) ; f(1:2, c(TRUE,FALSE), list(TRUE)) }");
@@ -1780,11 +1780,11 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(list(1,2), c(TRUE,NA), 10) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(list(1,2), c(TRUE,NA), c(10,11)) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; x <- list(1,2) ; z <- x ; f(x, c(TRUE,NA), c(10,11)) }");
- assertEval(Output.ContainsWarning, "{ x <- list(1,2) ; attr(x,\"my\") <- 10; x[c(TRUE,TRUE)] <- c(10,11,12); x }");
- assertEval(Output.ContainsWarning, "{ x <- list(1,0) ; x[as.logical(x)] <- c(10,11); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- list(1,2) ; attr(x,\"my\") <- 10; x[c(TRUE,TRUE)] <- c(10,11,12); x }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- list(1,0) ; x[as.logical(x)] <- c(10,11); x }");
assertEval("{ x <- list(1,0) ; x[is.na(x)] <- c(10,11); x }");
- assertEval(Output.ContainsWarning, "{ x <- list(1,0) ; x[c(TRUE,FALSE)] <- x[2:1] ; x }");
- assertEval(Output.ContainsWarning, "{ x <- list(1,0) ; attr(x,\"my\") <- 20 ; x[c(TRUE,FALSE)] <- c(11,12) ; x }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- list(1,0) ; x[c(TRUE,FALSE)] <- x[2:1] ; x }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- list(1,0) ; attr(x,\"my\") <- 20 ; x[c(TRUE,FALSE)] <- c(11,12) ; x }");
assertEval("{ x <- list(1,0) ; x[is.na(x)] <- c(10L,11L); x }");
assertEval("{ x <- list(1,0) ; x[c(TRUE,TRUE)] <- c(TRUE,NA); x }");
assertEval("{ x <- list(1,0) ; x[logical()] <- c(TRUE,NA); x }");
@@ -1815,20 +1815,20 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- c(1L,2L,3L,4L) ; x[c(TRUE,FALSE)] <- 5:6 ; x }");
assertEval("{ x <- c(1L,2L,3L,4L) ; attr(x,\"my\") <- 0 ; x[c(TRUE,FALSE)] <- 5:6 ; x }");
assertEval("{ x <- c(1L,2L,3L,4L) ; x[is.na(x)] <- 5:6 ; x }");
- assertEval(Output.ContainsWarning, "{ x <- c(1L,2L,3L,4L) ; x[c(TRUE,FALSE)] <- rev(x) ; x }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- c(1L,2L,3L,4L) ; x[c(TRUE,FALSE)] <- rev(x) ; x }");
assertEval("{ x <- c(1L,2L) ; x[logical()] <- 3L ; x }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,FALSE)] <- c(FALSE,NA) ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,FALSE,FALSE)] <- c(FALSE,NA) ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,NA)] <- c(FALSE,NA) ; b }");
- assertEval(Output.ContainsWarning, "{ b <- c(TRUE,NA,FALSE) ; b[c(TRUE,TRUE)] <- c(FALSE,NA) ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(TRUE,NA,FALSE) ; b[c(TRUE,TRUE)] <- c(FALSE,NA) ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE) ; b[c(TRUE,FALSE,TRUE,TRUE)] <- c(FALSE,NA,NA) ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,FALSE,TRUE,NA)] <- FALSE ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; z <- b ; b[c(TRUE,FALSE,TRUE,NA)] <- FALSE ; b }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; attr(b,\"my\") <- 10 ; b[c(TRUE,FALSE,TRUE,NA)] <- FALSE ; b }");
- assertEval(Output.ContainsWarning, "{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,FALSE,TRUE,FALSE)] <- b ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(TRUE,NA,FALSE,TRUE) ; b[c(TRUE,FALSE,TRUE,FALSE)] <- b ; b }");
assertEval("{ b <- c(TRUE,FALSE,FALSE,TRUE) ; b[b] <- c(TRUE,FALSE) ; b }");
- assertEval(Output.ContainsWarning, "{ f <- function(b,i,v) { b[b] <- b ; b } ; f(c(TRUE,FALSE,FALSE,TRUE)) ; f(1:3) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(b,i,v) { b[b] <- b ; b } ; f(c(TRUE,FALSE,FALSE,TRUE)) ; f(1:3) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(TRUE,FALSE,FALSE,TRUE),c(TRUE,FALSE), NA) ; f(1:4, c(TRUE,TRUE), NA) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(TRUE,FALSE,FALSE,TRUE),c(TRUE,FALSE), NA) ; f(c(FALSE,FALSE,TRUE), c(TRUE,TRUE), c(1,2,3)) }");
assertEval("{ b <- c(TRUE,NA,FALSE,TRUE) ; b[logical()] <- c(FALSE,NA) ; b }");
@@ -1839,7 +1839,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; b[c(TRUE,FALSE,NA)] <- \"X\" ; b }");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; b[logical()] <- \"X\" ; b }");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; b[c(FALSE,NA,NA)] <- c(\"X\",\"y\") ; b }");
- assertEval(Output.ContainsWarning, "{ b <- c(\"a\",\"b\",\"c\") ; b[c(FALSE,TRUE,TRUE)] <- c(\"X\",\"y\",\"z\") ; b }");
+ assertEval(Output.IgnoreWarningContext, "{ b <- c(\"a\",\"b\",\"c\") ; b[c(FALSE,TRUE,TRUE)] <- c(\"X\",\"y\",\"z\") ; b }");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; x <- b ; b[c(FALSE,TRUE,TRUE)] <- c(\"X\",\"z\") ; b } ");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; x <- b ; b[c(FALSE,TRUE,NA)] <- c(\"X\",\"z\") ; b }");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; b[is.na(b)] <- c(\"X\",\"z\") ; b }");
@@ -1848,7 +1848,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(\"a\",\"b\",\"c\"),c(TRUE,FALSE),c(\"A\",\"X\")) ; f(1:3,c(TRUE,FALSE),4) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(\"a\",\"b\",\"c\"),c(TRUE,FALSE),c(\"A\",\"X\")) ; f(c(\"A\",\"X\"),c(TRUE,FALSE),4) }");
assertEval("{ b <- c(\"a\",\"b\",\"c\") ; b[c(TRUE,FALSE,TRUE)] <- c(1+2i,3+4i) ; b }");
- assertEval(Output.ContainsError, "{ b <- as.raw(1:5) ; b[c(TRUE,FALSE,TRUE)] <- c(1+2i,3+4i) ; b }");
+ assertEval(Output.IgnoreErrorContext, "{ b <- as.raw(1:5) ; b[c(TRUE,FALSE,TRUE)] <- c(1+2i,3+4i) ; b }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(\"a\",\"b\",\"c\"),c(TRUE,FALSE),c(\"A\",\"X\")) ; f(f,c(TRUE,FALSE),4) }");
assertEval("{ f <- function(b,i,v) { b[i] <- v ; b } ; f(c(\"a\",\"b\",\"c\"),c(TRUE,FALSE),c(\"A\",\"X\")) ; f(c(\"A\",\"X\"),c(TRUE,FALSE),f) }");
@@ -2030,8 +2030,8 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ l<-list(a=1L,b=2L,c=list(d=1L,e=2L,f=c(x=1L,y=2L,z=3L))) ; l[[c(\"c\",\"f\")]] <- 100L ; l }");
assertEval("{ l<-list(a=1L,b=2L,c=list(d=1L,e=2L,f=c(x=1L,y=2L,z=3L))) ; l[[c(\"c\",\"f\")]] <- list(haha=\"gaga\") ; l }");
- assertEval(Output.ContainsError, "{ l <- list(list(1,2),2) ; l[[c(1,1,2,3,4,3)]] <- 10 ; l }");
- assertEval(Output.ContainsError, "{ l <- list(1,2) ; l[[c(1,1,2,3,4,3)]] <- 10 ; l }");
+ assertEval(Output.IgnoreErrorContext, "{ l <- list(list(1,2),2) ; l[[c(1,1,2,3,4,3)]] <- 10 ; l }");
+ assertEval(Output.IgnoreErrorContext, "{ l <- list(1,2) ; l[[c(1,1,2,3,4,3)]] <- 10 ; l }");
// copying
assertEval("{ l<-list() ; x <- 1:3 ; l[[1]] <- x; x[2] <- 100L; l[[1]] }");
@@ -2054,10 +2054,10 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,list(3)), c(3,1), 4) ; f(c(1,2,3), \"hello\", 2) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(x=3)),c(\"b\",\"x\"),10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=c(x=3)),c(\"b\",\"x\"),10) }");
- assertEval(Output.ContainsError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(c(1,2,b=c(x=3)),c(\"b\",\"x\"),10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(c(1,2,b=c(x=3)),c(\"b\",\"x\"),10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(c(1,2,b=c(x=3)),c(\"b\"),10) }");
- assertEval(Output.ContainsError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2, list(3)),c(\"b\",\"x\"),10) }");
- assertEval(Output.ContainsError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(3)),c(\"a\",\"x\"),10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2, list(3)),c(\"b\",\"x\"),10) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(3)),c(\"a\",\"x\"),10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(list(a=1,b=f),c(\"b\",\"x\"),3) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=list(x=1,y=2),3),4),c(\"b\",\"a\",\"x\"),10) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(list(a=1,b=2),\"b\",NULL) }");
@@ -2068,7 +2068,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(f,TRUE,3) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(c(a=1,b=2),\"b\",NULL) }");
assertEval("{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(c(a=1,b=2),\"b\",as.raw(12)) }");
- assertEval(Output.ContainsAmbiguousError, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(c(a=1,b=2),c(1+2i,3+4i),as.raw(12)) }");
+ assertEval(Output.IgnoreErrorMessage, "{ f <- function(b,i,v) { b[[i]] <- v ; b } ; f(list(1,2,b=list(a=1)),c(\"b\",\"a\"),10) ; f(c(a=1,b=2),c(1+2i,3+4i),as.raw(12)) }");
assertEval("{ l <- list(a=1,b=2,cd=list(c=3,d=4)) ; x <- list(l,xy=list(x=l,y=l)) ; x[[c(2,2,3,2)]] <- 10 ; l }");
assertEval("{ l <- list(a=1,b=2,cd=list(c=3,d=4)) ; x <- list(l,xy=list(x=l,y=l)) ; x[[c(\"xy\",\"y\",\"cd\",\"d\")]] <- 10 ; l }");
@@ -2096,14 +2096,14 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(as.complex(c(13,14)),c(\"\",\"\",\"\"),as.complex(23)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(as.complex(c(13,14)),c(\"\",\"\",NA),as.complex(23)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(as.raw(c(13,14)),c(\"a\",\"X\",\"a\"),as.raw(23)) }");
- assertEval(Output.ContainsWarning, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"a\",\"X\",\"a\",\"b\"),list(3,TRUE,FALSE)) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"a\",\"X\",\"a\",\"b\"),list(3,TRUE,FALSE)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),list(3,TRUE,FALSE)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),as.raw(10)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),as.complex(10)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1:3,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),1:3) }");
- assertEval(Output.ContainsWarning, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1+2i,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),c(TRUE,NA)) }");
+ assertEval(Output.IgnoreWarningContext, "{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1+2i,3:1,4:6) ; f(c(X=1,a=2),c(\"X\",\"b\",NA),c(TRUE,NA)) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1+2i,3:1,4:6) ; f(c(X=1L,a=2L),c(\"X\",\"b\",NA),c(TRUE,NA,FALSE)) }");
- assertEval(Output.ContainsError, "{ f <- function(b, i, v) { b[[i]] <- v ; b } ; f(1+2i,3:1,4:6) ; f(c(X=1L,a=2L),c(\"X\",\"b\",NA),NULL) }");
+ assertEval(Output.IgnoreErrorContext, "{ f <- function(b, i, v) { b[[i]] <- v ; b } ; f(1+2i,3:1,4:6) ; f(c(X=1L,a=2L),c(\"X\",\"b\",NA),NULL) }");
assertEval("{ f <- function(b, i, v) { b[i] <- v ; b } ; f(1+2i,3:1,4:6) ; f(list(X=1L,a=2L),c(\"X\",\"b\",NA),NULL) }");
assertEval("{ b <- c(a=1+2i,b=3+4i) ; dim(b) <- c(2,1) ; b[c(\"a\",\"b\")] <- 3+1i ; b }");
@@ -2137,8 +2137,8 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- NULL; x[[c(0,1)]] <- c(); x; }");
assertEval("{ x <- NULL; x[[c(0,2)]] <- c(); x; }");
assertEval("{ x <- NULL; x[[0]] <- c(5); x; }");
- assertEval(Output.ContainsError, "{ x <- NULL; x[[c(1,0)]] <- c(5); x; }");
- assertEval(Output.ContainsError, "{ x <- NULL; x[[c(1,2)]] <- c(5); x; }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- NULL; x[[c(1,0)]] <- c(5); x; }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- NULL; x[[c(1,2)]] <- c(5); x; }");
assertEval("{ x <- NULL; x[[c(0,1)]] <- c(5); x; }");
assertEval("{ x <- NULL; x[[c(0,2)]] <- c(5); x; }");
assertEval("{ x <- NULL; x[[0]] <- c(1,5); x; }");
@@ -2155,12 +2155,12 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ x <- NULL; x[c(0,1)] <- c(5); x; }");
assertEval("{ x <- NULL; x[c(0,2)] <- c(5); x; }");
assertEval("{ x <- NULL; x[0] <- c(1,5); x; }");
- assertEval(Output.ContainsWarning, "{ x <- NULL; x[1] <- c(1,5); x; }");
- assertEval(Output.ContainsWarning, "{ x <- NULL; x[c(1,0)] <- c(1,5); x; }");
- assertEval(Output.ContainsWarning, "{ x <- NULL; x[c(0,1)] <- c(1,5); x; }");
- assertEval(Output.ContainsWarning, "{ x <- NULL; x[c(0,2)] <- c(1,5); x; }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- NULL; x[[c(1,0)]] <- c(1,5); x; }");
- assertEval(Output.ContainsAmbiguousError, "{ x <- NULL; x[[c(1,2)]] <- c(1,5); x; }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- NULL; x[1] <- c(1,5); x; }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- NULL; x[c(1,0)] <- c(1,5); x; }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- NULL; x[c(0,1)] <- c(1,5); x; }");
+ assertEval(Output.IgnoreWarningContext, "{ x <- NULL; x[c(0,2)] <- c(1,5); x; }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- NULL; x[[c(1,0)]] <- c(1,5); x; }");
+ assertEval(Output.IgnoreErrorMessage, "{ x <- NULL; x[[c(1,2)]] <- c(1,5); x; }");
assertEval(Ignored.Unknown, "{ x <- NULL; x[[1]] <- c(1,5); x; }");
}
@@ -2217,7 +2217,7 @@ public class TestSimpleVectors extends TestBase {
assertEval("{ c(\"1L\",\"hello\") %in% 1:10 }");
assertEval("{ (1 + 2i) %in% c(1+10i, 1+4i, 2+2i, 1+2i) }");
assertEval("{ as.logical(-1:1) %in% TRUE }");
- assertEval(Output.ContainsError, "{ x <- function(){1} ; x %in% TRUE }");
+ assertEval(Output.IgnoreErrorContext, "{ x <- function(){1} ; x %in% TRUE }");
}
@Test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java
index 633ed46e3a..28a1d7795a 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestStats.java
@@ -32,7 +32,7 @@ public class TestStats extends TestBase {
assertEval("{ cor(c(1,2,3),c(1,2,3)) }");
assertEval("{ as.integer(cor(c(1,2,3),c(1,2,5))*10000000) }");
assertEval("{ cor(cbind(c(3,2,1), c(1,2,3))) }");
- assertEval(Output.ContainsWarning, "{ cor(cbind(c(1, 1, 1), c(1, 1, 1))) }");
+ assertEval(Output.IgnoreWarningContext, "{ cor(cbind(c(1, 1, 1), c(1, 1, 1))) }");
assertEval("{ cor(cbind(c(1:9,0/0), 101:110)) }");
assertEval("{ round( cor(cbind(c(10,5,4,1), c(2,5,10,5))), digits=5 ) }");
}
@@ -170,7 +170,7 @@ public class TestStats extends TestBase {
assertEval("na.fail(c(1L, 2L))");
assertEval("na.fail(c(1,NA,3))");
assertEval("na.fail(c(NA, 2L))");
- assertEval(Output.ContainsError, "na.fail(c())");
- assertEval(Output.ContainsError, "na.fail(NULL)");
+ assertEval(Output.IgnoreErrorContext, "na.fail(c())");
+ assertEval(Output.IgnoreErrorContext, "na.fail(NULL)");
}
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/parser/TestParser.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/parser/TestParser.java
index 1b58e7a8d9..973915f962 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/parser/TestParser.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/parser/TestParser.java
@@ -65,18 +65,18 @@ public class TestParser extends TestBase {
assertEval("y <- 2; z <- 5; x <- (y *\n z)");
assertEval("y <- 2; z <- 5; x <- (y \n * z)");
assertEval("y <- 2; z <- 5; x <- ({y *\n z})");
- assertEval(Output.ContainsAmbiguousError, "y <- 2; z <- 5; x <- ({y \n * z})");
+ assertEval(Output.IgnoreErrorMessage, "y <- 2; z <- 5; x <- ({y \n * z})");
assertEval("y <- 2; z <- 5; x <- ({(y *\n z)})");
assertEval("y <- 2; z <- 5; x <- ({(y \n * z)})");
assertEval("a <- 1:100; y <- 2; z <- 5; x <- ({(a[y *\n z])})");
assertEval("a <- 1:100; y <- 2; z <- 5; x <- ({(a[[y \n * z]])})");
- assertEval(Output.ContainsAmbiguousError, "a <- 1:100; y <- 2; z <- 5; x <- (a[[{y \n * z}]])");
+ assertEval(Output.IgnoreErrorMessage, "a <- 1:100; y <- 2; z <- 5; x <- (a[[{y \n * z}]])");
}
@Test
public void testLexerError() {
// FastR provides a more accurate error message
- assertEval(Output.ContainsAmbiguousError, "%0");
+ assertEval(Output.IgnoreErrorMessage, "%0");
}
/**
--
GitLab