Changeset 12323

Timestamp:

01/01/10 19:41:15 (14 years ago)

Author:

ehuelsmann

Message:

Implement setting of external format on a stream;

only supported on the Java side for now.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FileStream.java (modified) (1 diff)
• Stream.java (modified) (4 diffs)

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

@@ -152 +152 @@
     }
 
+    @Override
+    public void setExternalFormat(LispObject format) {
+        super.setExternalFormat(format);
+
+        if (racf != null)
+            // setExternalFormat also called before 'racf' is set up
+            racf.setEncoding(encoding);
+    }
+
     public Pathname getPathname()
     {

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

@@ -270 +270 @@
       return externalFormat;
   }
-  
+
   public String getEncoding() {
       return encoding;
   }
-  
+
   public void setExternalFormat(LispObject format) {
+    // make sure we encode any remaining buffers with the current format
+    finishOutput();
+
     if (format == keywordDefault) {
       encoding = null;
@@ -283 +286 @@
       return;
     }
-      
+
     LispObject enc;
     boolean encIsCp = false;
-    
+
     if (format instanceof Cons) {
         // meaning a non-empty list
@@ -295 +298 @@
             enc = getf(format.cdr(), keywordID, null);
         }
-          
+
         LispObject eol = getf(format.cdr(), keywordEolStyle, keywordRAW);
         if (eol == keywordCR)
@@ -305 +308 @@
         else if (eol != keywordRAW)
             ; //###FIXME: raise an error
-        
+
     } else
       enc = format;
-    
+
     if (enc.numberp())
         encoding = enc.toString();