Changeset 11422

Timestamp:

12/06/08 12:16:01 (14 years ago)

Author:

ehuelsmann

Message:

Fix CLEAR-INPUT tests.

• Stream.java:Stream::_clearInput(): Check for end-of-stream (-1) return value in

_readChar().

• Stream.java:Stream::reader: make protected so that it becomes available to subclasses.

File:

• branches/open-external-format/src/org/armedbear/lisp/Stream.java (modified) (2 diffs)

branches/open-external-format/src/org/armedbear/lisp/Stream.java

@@ -66 +66 @@
   private boolean interactive;
   private boolean open = true;
-
+  
   // Character input.
-  private PushbackReader reader;
+  protected PushbackReader reader;
   protected int offset;
   protected int lineNumber;
@@ -2069 +2069 @@
     if (reader != null)
       {
-        while (_charReady())
-          _readChar();
+        int c = 0;
+        while (_charReady() && (c >= 0))
+          c = _readChar();
       }
     else if (in != null)