Changeset 14209

Timestamp:

10/21/12 16:09:53 (8 years ago)

Author:

ehuelsmann

Message:

Re #253: BABEL-TESTS fails to compile; Fix character being discarded
due to not being unread into underlying stream.

File:

• trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java (modified) (4 diffs)

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

@@ -128 +128 @@
     public LispObject listen()
     {
-        if (unreadChar >= 0)
-            return T;
         if (streams == NIL)
             return NIL;
-        LispObject obj = readCharNoHang(false, this);
-        if (obj == this)
-            return NIL;
-        unreadChar = ((LispCharacter)obj).getValue();
-        return T;
-    }
-
-    private int unreadChar = -1;
+        Stream stream = (Stream)streams.car();
+        return stream.listen();
+    }
 
     // Returns -1 at end of file.
@@ -146 +139 @@
     {
         int n;
-        if (unreadChar >= 0) {
-            n = unreadChar;
-            unreadChar = -1;
-            return n;
-        }
         if (streams == NIL)
             return -1;
@@ -162 +150 @@
 
     @Override
-    protected void _unreadChar(int n)
-    {
-        if (unreadChar >= 0)
-            error(new StreamError(this, "UNREAD-CHAR was invoked twice consecutively without an intervening call to READ-CHAR."));
-        unreadChar = n;
+    protected void _unreadChar(int n) throws java.io.IOException
+    {
+      if (streams == NIL)
+            error(new StreamError(this, "UNREAD-CHAR was invoked without a stream to unread into."));
+      Stream stream = (Stream)streams.car();
+
+      stream._unreadChar(n);
     }
 
@@ -172 +162 @@
     protected boolean _charReady() throws java.io.IOException
     {
-        if (unreadChar >= 0)
-            return true;
         if (streams == NIL)
             return false;