From: Mark Wielaard <mark@klomp.org>
Date: Tue, 16 Jul 2002 21:08:25 +0000 (+0000)
Subject: StreamTokenizer.java (pushBack): Update documentation.
X-Git-Tag: releases/gcc-3.3.0~3813
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00e0a9e83de7e15ab213b09745c3bbd433516e11;p=thirdparty%2Fgcc.git

StreamTokenizer.java (pushBack): Update documentation.

	* java/io/StreamTokenizer.java (pushBack): Update documentation.
	(whitespaceChars): call resetChar().

From-SVN: r55496
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b8981122027a..242638f5d95e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16  Mark Wielaard  <mark@klomp.org>
+
+	* java/io/StreamTokenizer.java (pushBack): Update documentation.
+	(whitespaceChars): call resetChar().
+
 2002-07-15  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/java/io/StreamTokenizer.java b/libjava/java/io/StreamTokenizer.java
index f2e39698ca6f..5b3533b633d1 100644
--- a/libjava/java/io/StreamTokenizer.java
+++ b/libjava/java/io/StreamTokenizer.java
@@ -1,5 +1,5 @@
 /* StreamTokenizer.java -- parses streams of characters into tokens
-   Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+   Copyright (C) 1998, 1999, 2000, 2001, 2002  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -554,16 +554,13 @@ public class StreamTokenizer
   }
 
   /**
-   * This method returns the current line number.  Note that if the 
-   * <code>pushBack()</code> method is called, it has no effect on the
-   * line number returned by this method.
-   *
-   * @return The current line number
+   * Puts the current token back into the StreamTokenizer so
+   * <code>nextToken</code> will return the same value on the next call.
+   * May cause the lineno method to return an incorrect value
+   * if lineno is called before the next call to nextToken.
    */
   public void pushBack()
   {
-    // pushBack may cause the lineno method to return an incorrect value
-    // if lineno is called before the next call to nextToken.
     pushedBack = true;
   }
 
@@ -670,7 +667,10 @@ public class StreamTokenizer
     if (hi > 255)
       hi = 255;
     for (int i = low; i <= hi; i++)
-      whitespace[i] = true;
+      {
+	resetChar(i);
+	whitespace[i] = true;
+      }
   }
 
   /**