Changeset 11428

Timestamp:

12/06/08 19:33:15 (12 years ago)

Author:

ehuelsmann

Message:

Fix LISTEN.1 and LISTEN.3 by checking if a character can actually be read from the input stream, or whether it may be EOF.

File:

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

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

@@ -64 +64 @@
   protected boolean isBinaryStream;
 
+  private boolean pastEnd = false;
   private boolean interactive;
   private boolean open = true;
@@ -204 +205 @@
   {
     if (! (reader instanceof PushbackReader))
-        this.reader = new PushbackReader(reader, 2);
+        this.reader = new PushbackReader(reader, 5);
     else
         this.reader = (PushbackReader)reader;
@@ -1737 +1738 @@
   public LispObject listen() throws ConditionThrowable
   {
-    return _charReady() ? T : NIL;
+    if (pastEnd)
+      return NIL;
+    
+    if (! _charReady())
+      return NIL;
+    
+    int n = _readChar();
+    if (n < 0)
+      return NIL;
+
+    _unreadChar(n);
+    
+    return T;
   }
 
@@ -1785 +1798 @@
   protected int _readChar() throws ConditionThrowable
   {
+    if (pastEnd)
+      return -1;
+    
     try
       {
         int n = reader.read();
         
-        if (n < 0)
+        if (n < 0) {
+            pastEnd = true;
             return -1;
+        }
         
         ++offset;
@@ -2012 +2030 @@
     try
       {
-        return in.read(); // Reads an 8-bit byte.
+        int n = in.read();
+        if (n < 0)
+          pastEnd = true;
+        
+        return n; // Reads an 8-bit byte.
       }
     catch (IOException e)
@@ -2081 +2103 @@
         try
           {
+            int n = 0;
             while (in.available() > 0)
-              in.read();
+              n = in.read();
+            
+            if (n < 0)
+              pastEnd = true;
           }
         catch (IOException e)