Changeset 11419

Timestamp:

12/05/08 22:58:19 (12 years ago)

Author:

ehuelsmann

Message:

Make one variable out of reader and pushbackReader: they need to point to the exact same stream anyway.

File:

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

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

@@ -68 +68 @@
 
   // Character input.
-  private Reader reader;
-  private PushbackReader pushbackReader;
+  private PushbackReader reader;
   protected int offset;
   protected int lineNumber;
@@ -90 +89 @@
   }
 
-  static final private Symbol keywordDefault = Packages.internKeyword("DEFAULT");
+  static final protected Symbol keywordDefault = Packages.internKeyword("DEFAULT");
   
   static final private Symbol keywordCodePage = Packages.internKeyword("CODE-PAGE");
@@ -107 +106 @@
   protected LispObject externalFormat = LispObject.NIL;
   protected String encoding = null;
+  protected char lastChar = 0;
   
   // Binary input.
@@ -145 +145 @@
               new InputStreamReader(inputStream);
           }
-        pushbackReader = new PushbackReader(new BufferedReader(inputStreamReader),
-              2);
-  initAsCharacterInputStream(pushbackReader);
+        initAsCharacterInputStream(new BufferedReader(inputStreamReader));
       }
     else
@@ -205 +203 @@
   protected void initAsCharacterInputStream(Reader reader)
   {
-    this.reader = reader;
+    if (! (reader instanceof PushbackReader))
+        this.reader = new PushbackReader(reader, 2);
+    else
+        this.reader = (PushbackReader)reader;
+    
     isInputStream = true;
     isCharacterStream = true;
@@ -1824 +1826 @@
     try
       {
-        pushbackReader.unread(n);
+        reader.unread(n);
         --offset;
         if (n == eolChar)
@@ -1875 +1877 @@
       {
         if (c == '\n') {
-    if (eolStyle == EolStyle.CRLF)
-              writer.write("\r\n");
-          else
-              writer.write(eolChar);
-          
+    if (eolStyle == EolStyle.CRLF && lastChar != '\r')
+              writer.write('\r');
+
+          writer.write(eolChar);
+          lastChar = eolChar;
           writer.flush();
           charPos = 0;
         } else {
           writer.write(c);
+          lastChar = c;
           ++charPos;
         }
@@ -1916 +1919 @@
             // writing the space between newlines as chunks.
             _writeChar(chars[i]);
-          
-        } else
+          return;
+        }
+        
         writer.write(chars, start, end - start);
-        
+        lastChar = chars[end-1];
         int index = -1;
         for (int i = end; i-- > start;)
@@ -2138 +2142 @@
         writer.write(sw.toString());
         writer.write('\n');
+        lastChar = '\n';
         writer.flush();
         charPos = 0;