Changeset 11430

Timestamp:

12/06/08 21:13:50 (13 years ago)

Author:

ehuelsmann

Message:

Resolve 2 FIXMEs.

• Stream.java:Stream::_writeChars(): Don't try to access characters before 'start'.

• StringInputStream?.java:StringInputStream(),
• StringOutputStream?.java:StringOutputStream(): Use RAW eol style, as per the FIXME.

Location:

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

Files:

• Stream.java (modified) (1 diff)
• StringInputStream.java (modified) (1 diff)
• StringOutputStream.java (modified) (1 diff)

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

@@ -1946 +1946 @@
         
         writer.write(chars, start, end - start);
-        lastChar = chars[end-1];
+        if (start < end)
+          lastChar = chars[end-1];
+        
         int index = -1;
         for (int i = end; i-- > start;)

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

@@ -55 +55 @@
         elementType = Symbol.CHARACTER;
         setExternalFormat(keywordDefault);
-        //###FIXME: we actually want RAW here
-        eolStyle = EolStyle.LF;
+        eolStyle = EolStyle.RAW;
 
         this.start = start;

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;
+        this.eolStyle = EolStyle.RAW;
         initAsCharacterOutputStream(stringWriter = new StringWriter());
     }