Changeset 11411

Timestamp:

12/03/08 21:35:51 (15 years ago)

Author:

ehuelsmann

Message:

Fix eol-style initialization and double-output.

File:

• branches/open-external-format/src/org/armedbear/lisp/Stream.java (modified) (2 diffs)

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

@@ -102 +102 @@
     
   protected EolStyle eolStyle = platformEolStyle;
-  protected char eolChar = 0;
+  protected char eolChar = (eolStyle == EolStyle.CR) ? '\r' : '\n';
   protected LispObject externalFormat = LispObject.NIL;
   protected String encoding = null;
@@ -1884 +1884 @@
       {
         if (eolStyle != EolStyle.RAW) {
-          for (int i = start; i++ < end;)
+          for (int i = start; i < end; i++)
             //###FIXME: the number of writes can be greatly reduced by
             // writing the space between newlines as chunks.
             _writeChar(chars[i]);
-        }
+          
+        } else
+          writer.write(chars, start, end - start);
         
-        writer.write(chars, start, end - start);
         int index = -1;
         for (int i = end; i-- > start;)