[armedbear-cvs] r11425 - branches/open-external-format/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat Dec  6 14:00:44 2008
New Revision: 11425

Log:
Fix most reader test failures: don't increment the current position if we're past the end of our input stream.


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

Modified: branches/open-external-format/src/org/armedbear/lisp/Stream.java
==============================================================================
--- branches/open-external-format/src/org/armedbear/lisp/Stream.java	(original)
+++ branches/open-external-format/src/org/armedbear/lisp/Stream.java	Sat Dec  6 14:00:44 2008
@@ -1787,6 +1787,10 @@
     try
       {
         int n = reader.read();
+        
+        if (n < 0)
+            return -1;
+        
         ++offset;
         if (eolStyle == EolStyle.CRLF && n == '\r') {
             n = _readChar();