From: Andrew Haley <aph@redhat.com>
Date: Fri, 1 Sep 2000 15:00:59 +0000 (+0000)
Subject: StreamTokenizer.java: Don't throw a NumberFormatException if a field is numeric as... 
X-Git-Tag: prereleases/libstdc++-2.92~4321
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad17a40dcec76fcb2746f6c6d9e3b5071e04e004;p=thirdparty%2Fgcc.git

StreamTokenizer.java: Don't throw a NumberFormatException if a field is numeric as far as the...

2000-09-01  Andrew Haley  <aph@redhat.com>

        * java/io/StreamTokenizer.java: Don't throw a
        NumberFormatException if a field is numeric as far as the
        StreamTokenizer is concerned but not as far as Double.valueOf() is
        concerned: return a zero instead.

	For gcj/141.

From-SVN: r36100
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5d6ac892b915..a8a8b007a395 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-01  Andrew Haley  <aph@redhat.com>
+
+        * java/io/StreamTokenizer.java: Don't throw a
+        NumberFormatException if a field is numeric as far as the
+        StreamTokenizer is concerned but not as far as Double.valueOf() is
+        concerned: return a zero instead.	
+
 2000-08-30  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java
index 3c4d8c6cfa10..b3c80030216c 100644
--- a/libjava/java/io/StreamTokenizer.java
+++ b/libjava/java/io/StreamTokenizer.java
@@ -293,16 +293,21 @@ public class StreamTokenizer
       ttype = TT_EOF;
     else if (isNumeric(ch))
       {
+	boolean isNegative = false;
 	if (ch == '-')
 	  {
 	    // Read ahead to see if this is an ordinary '-' rather than numeric.
 	    ch = in.read();
-	    if (ch != TT_EOF)
-	      in.unread(ch);
 	    if (isNumeric(ch) && ch != '-')
-	      ch = '-';
+	      {
+		isNegative = true;
+	      }
 	    else
-	      return (ttype = '-');
+	      {
+		if (ch != TT_EOF)
+		  in.unread(ch);
+		return (ttype = '-');
+	      }
 	  }
 
 	StringBuffer tokbuf = new StringBuffer();
@@ -318,7 +323,16 @@ public class StreamTokenizer
 	if (ch != TT_EOF)
 	  in.unread(ch);
 	ttype = TT_NUMBER;
-	nval = Double.valueOf(tokbuf.toString()).doubleValue();
+	try
+	  {
+	    nval = Double.valueOf(tokbuf.toString()).doubleValue();
+	  }
+	catch (NumberFormatException _)
+	  {
+	    nval = 0.0;
+	  }
+	if (isNegative)
+	  nval = -nval;
       }
     else if (isAlphabetic(ch))
       {