diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-06 00:49:29 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-06 00:49:29 +0000 |
| commit | 818acfd366eca570b3f212f821144bd067a2c7bb (patch) | |
| tree | 8e19824994603788f6a7b5c765d6b5756cfbaef6 /libjava | |
| parent | 40eda1f2c3c9f227bf14d6ec9a41478fc5f16e13 (diff) | |
| download | gcc-818acfd366eca570b3f212f821144bd067a2c7bb.tar.gz | |
* java/io/StreamTokenizer.java (TT_NONE): Now private.
(nextToken): Handle backslashed newline. From Oskar Liljeblad.
For PR java.io/301.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35511 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/io/StreamTokenizer.java | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7532d37ed46..4d0cf0b1dd3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-08-04 Tom Tromey <tromey@cygnus.com> + + * java/io/StreamTokenizer.java (TT_NONE): Now private. + (nextToken): Handle backslashed newline. From Oskar Liljeblad. + For PR java.io/301. + 2000-08-03 Warren Levy <warrenl@cygnus.com> * java/io/ObjectInputStream.java (readFields): Turn off diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java index f0099d40abe..3c4d8c6cfa1 100644 --- a/libjava/java/io/StreamTokenizer.java +++ b/libjava/java/io/StreamTokenizer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -37,7 +37,7 @@ public class StreamTokenizer public static final int TT_WORD = -3; /** A constant indicating that no tokens have been read yet. */ - public static final int TT_NONE = -4; + private static final int TT_NONE = -4; /** * Contains the type of the token read resulting from a call to nextToken @@ -365,6 +365,10 @@ public class StreamTokenizer break; case 'v': ch = 0xB; break; + case '\n': ch = '\n'; + break; + case '\r': ch = '\r'; + break; case '\"': case '\'': case '\\': |