StreamTokenizer.java (TT_NONE): Now private.

	* java/io/StreamTokenizer.java (TT_NONE): Now private.
	(nextToken): Handle backslashed newline.  From Oskar Liljeblad.
	For PR java.io/301.

From-SVN: r35511

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7532d37ed46751580b8fadfa1054afe4eaf20990..4d0cf0b1dd3b4b8faa7a284e6a0cfbe4cb63be98 100644 (file)
--- 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 f0099d40abe4b5895d92f9dbaa9f016a902e83fc..3c4d8c6cfa102b9d95fca29f386a33f0e71d7caa 100644 (file)
--- 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 '\\':