Changeset 11426

Timestamp:

12/06/08 14:18:06 (15 years ago)

Author:

ehuelsmann

Message:

Make sure we don't write more characters to the string than requested:
no eol translation for strings.

Location:

branches/open-external-format/src/org/armedbear/lisp

Files:

• StringInputStream.java (modified) (1 diff)
• StringOutputStream.java (modified) (2 diffs)

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

@@ -54 +54 @@
         elementType = Symbol.CHARACTER;
         setExternalFormat(keywordDefault);
-        
+        //###FIXME: we actually want RAW here
+        eolStyle = EolStyle.LF;
+
         stringReader = new StringReader(s.substring(start, end));
         initAsCharacterInputStream(stringReader);

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

@@ -48 +48 @@
     {
         this.elementType = elementType;
+        //###FIXME we actually want RAW here
+        this.eolStyle = EolStyle.LF;
         initAsCharacterOutputStream(stringWriter = new StringWriter());
     }
@@ -82 +84 @@
         if (elementType == NIL)
             return 0;
-        return stringWriter.toString().length();
+        return stringWriter.getBuffer().length();
     }