Changeset 14211

Timestamp:

10/21/12 18:18:20 (8 years ago)

Author:

ehuelsmann

Message:

Re #253: Prevent unreading eofValue if eofValue happens to be a LispCharacter?.

File:

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

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

@@ -39 +39 @@
 public final class peek_char extends Primitive
 {
+    private static LispObject internalEOF = new LispObject();
+    
     private peek_char()
     {
@@ -69 +71 @@
             else
                 in = stream;
-            final LispObject result = in.readChar(eofError, eofValue);
+            final LispObject result = in.readChar(eofError, internalEOF);
+            if (result == internalEOF)
+                return eofValue;
             if (result instanceof LispCharacter)
                 in.unreadChar((LispCharacter)result);
@@ -80 +84 @@
             Readtable rt = currentReadtable();
             while (true) {
-                LispObject result = stream.readChar(eofError, eofValue);
+                LispObject result = stream.readChar(eofError, internalEOF);
+                if (result == internalEOF)
+                    return eofValue;
+                
                 if (result instanceof LispCharacter) {
                     char c = ((LispCharacter)result).value;
@@ -97 +104 @@
             char c = ((LispCharacter)peekType).value;
             while (true) {
-                LispObject result = stream.readChar(eofError, eofValue);
+                LispObject result = stream.readChar(eofError, internalEOF);
+                if (result == internalEOF)
+                    return eofValue;
+                
                 if (result instanceof LispCharacter) {
                     if (((LispCharacter)result).value == c) {