Changeset 12036

Timestamp:

07/11/09 12:08:20 (14 years ago)

Author:

ehuelsmann

Message:

Improve - but do not fully fix - line number counting.

Note: See the line numbers generated for clos.lisp to

see the improvement and remaining issue.

File:

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

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

@@ -1929 +1929 @@
         
     ++offset;
-    if (eolStyle == EolStyle.CRLF && n == '\r') {
+    if (n == '\r' && eolStyle == EolStyle.CRLF) {
         n = _readChar();
         if (n != '\n') {
@@ -1956 +1956 @@
     if (reader == null)
         streamNotCharacterInputStream();
+
+    --offset;
+    if (n == '\n') {
+        n = eolChar;
+        --lineNumber;
+    }
+
     reader.unread(n);
-    --offset;
     pastEnd = false;
-    if (n == eolChar)
-        --lineNumber;
   }