Fix parsing of -Inf, +/-NaN

Author: steve-s

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RRuntime.java

@@ -493,15 +493,18 @@ public static int string2int(String s) {
     @TruffleBoundary
     public static double string2doubleNoCheck(String v, boolean exceptionOnFail) {
         // FIXME use R rules
-        if ("Inf".equals(v)) {
+        String trimmed = v.trim();
+        if ("Inf".equals(trimmed) || "+Inf".equals(trimmed)) {
             return Double.POSITIVE_INFINITY;
-        } else if ("NaN".equals(v)) {
+        } else if ("-Inf".equals(trimmed)) {
+            return Double.NEGATIVE_INFINITY;
+        } else if ("NaN".equals(trimmed) || "+NaN".equals(trimmed) || "-NaN".equals(trimmed)) {
             return Double.NaN;
-        } else if ("NA_real_".equals(v)) {
+        } else if ("NA_real_".equals(trimmed)) {
             return DOUBLE_NA;
         }
         try {
-            return Double.parseDouble(v);
+            return Double.parseDouble(trimmed);
         } catch (NumberFormatException e) {
             if (hasHexPrefix(v)) {
                 switch (v.charAt(0)) {

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -6798,6 +6798,36 @@ Time differences in hours
 #if (!any(R.version$engine == "FastR")) { [1] TRUE } else { { x <- c(1, 3.5); .fastr.identity(x) == .fastr.identity(as.double(x)); } }
 Error: unexpected '[' in "if (!any(R.version$engine == "FastR")) { ["
 
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> +Inf	<<<NEWLINE>>> ')
+[1] Inf
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> +NaN	<<<NEWLINE>>> ')
+[1] NaN
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> -Inf	<<<NEWLINE>>> ')
+[1] -Inf
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> -NaN	<<<NEWLINE>>> ')
+[1] NaN
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> Inf	<<<NEWLINE>>> ')
+[1] Inf
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('	<<<NEWLINE>>> NaN	<<<NEWLINE>>> ')
+[1] NaN
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
+#as.double('- Inf')
+[1] NA
+Warning message:
+NAs introduced by coercion
+
 ##com.oracle.truffle.r.test.builtins.TestBuiltin_asdouble.testAsDouble#
 #{ as.double("1.27") }
 [1] 1.27
@@ -21250,7 +21280,7 @@ Error in f() :
 #{ f <- function() { delayedAssign("x", y); y <- 10; x  } ; f() }
 [1] 10
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_delayedAssign.testDelayedAssign#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_delayedAssign.testDelayedAssign#Output.IgnoreErrorContext#
 #{ f <- function() { delayedAssign("x",y); delayedAssign("y",x); g(x, y)}; g <- function(x, y) { x + y }; f() }
 Error in g(x, y) :
   promise already under evaluation: recursive default argument reference or earlier problems?
@@ -21260,7 +21290,7 @@ Error in g(x, y) :
 Error in f() :
   promise already under evaluation: recursive default argument reference or earlier problems?
 
-##com.oracle.truffle.r.test.builtins.TestBuiltin_delayedAssign.testDelayedAssign#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_delayedAssign.testDelayedAssign#Output.IgnoreErrorContext#
 #{ f <- function() { delayedAssign("x",y); delayedAssign("y",x); paste(x, y)}; f() }
 Error in paste(x, y) :
   promise already under evaluation: recursive default argument reference or earlier problems?

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

@@ -14,7 +14,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * Copyright (c) 2012-2014, Purdue University
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates
  *
  * All rights reserved.
  */
@@ -201,6 +201,14 @@ public void testAsDouble() {
         assertEval("{ f <- function() as.double('aaa'); f() }");
         assertEval("{ f <- function() as.numeric('aaa'); f() }");
         assertEval("{ f1 <- function() {f<- function() as.double('aaa'); f()}; f1() }");
+
+        assertEval("as.double('\t\n Inf\t\n ')");
+        assertEval("as.double('\t\n +Inf\t\n ')");
+        assertEval("as.double('\t\n -Inf\t\n ')");
+        assertEval("as.double('\t\n NaN\t\n ')");
+        assertEval("as.double('\t\n +NaN\t\n ')");
+        assertEval("as.double('\t\n -NaN\t\n ')");
+        assertEval("as.double('- Inf')");
     }
 
     @Test