From ad17a40dcec76fcb2746f6c6d9e3b5071e04e004 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Fri, 1 Sep 2000 15:00:59 +0000 Subject: [PATCH] StreamTokenizer.java: Don't throw a NumberFormatException if a field is numeric as far as the... 2000-09-01 Andrew Haley * 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 --- libjava/ChangeLog | 7 +++++++ libjava/java/io/StreamTokenizer.java | 24 +++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5d6ac89..a8a8b00 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2000-09-01 Andrew Haley + + * 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 * Makefile.in: Rebuilt. diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java index 3c4d8c6..b3c8003 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)) { -- 2.7.4