diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java index feeb6a124fda2e5480f08e804be6b2e37778fb5a..6b2bbd3a2e5236671455d283ddb47f379af0254d 100644 --- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java +++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ops/na/NACheck.java @@ -350,9 +350,9 @@ public final class NACheck { } result[i] = intValue; } - if (warning) { - RError.warning(RError.SHOW_CALLER2, RError.Message.NA_INTRODUCED_COERCION); - } + } + if (warning) { + RError.warning(RError.SHOW_CALLER2, RError.Message.NA_INTRODUCED_COERCION_INT); } return result; } diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test index ad7bb4866368061de942da405c079d5a6e2ab34c..90532417fa2f6d21fff917b1418f3ad7190a026b 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test @@ -6438,7 +6438,7 @@ integer(0) #argv <- list(4999.0000000001);as.integer(argv[[1]]); [1] 4999 -##com.oracle.truffle.r.test.builtins.TestBuiltin_asinteger.testasinteger17#Ignored.Unknown#Output.IgnoreWarningContext# +##com.oracle.truffle.r.test.builtins.TestBuiltin_asinteger.testasinteger17# #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]]); [1] 100 0 NA NA NA 3 NA Warning message: 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 90ef68d16f5f7d62ed031dd2d04b0ac51a669b21..dc6b2ebb7ac90798f560f21007f87cbc3592583f 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,8 +96,7 @@ public class TestBuiltin_asinteger extends TestBase { @Test public void testasinteger17() { - 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]]);"); + assertEval("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]]);"); } @Test