Changeset 14091

Timestamp:

08/14/12 21:53:16 (8 years ago)

Author:

ehuelsmann

Message:

Make LISTEN work for non-character input streams.

Found by Stas Boukarev.
Patch by me.

File:

• trunk/abcl/src/org/armedbear/lisp/Stream.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/Stream.java

@@ -1690 +1690 @@
             return NIL;
         try {
-            if (! _charReady())
-                return NIL;
-
-            int n = _readChar();
-            if (n < 0)
-                return NIL;
-
-            _unreadChar(n);
-
-            return T;
+            if (isCharacterInputStream()) {
+                if (! _charReady())
+                    return NIL;
+
+                int n = _readChar();
+                if (n < 0)
+                    return NIL;
+
+                _unreadChar(n);
+
+                return T;
+            } else if (isInputStream()) {
+                if (! _byteReady())
+                    return NIL;
+                
+                return T;
+            } else
+                return error(new StreamError(this, "Not an input stream"));
         } catch (IOException e) {
             return error(new StreamError(this, e));
@@ -1796 +1804 @@
             streamNotCharacterInputStream();
         return reader.ready();
+    }
+    
+    protected boolean _byteReady() throws IOException {
+        if (in == null)
+            streamNotInputStream();
+        return (in.available() != 0);
     }