Changeset 11404

Timestamp:

11/30/08 13:32:16 (15 years ago)

Author:

ehuelsmann

Message:

Default to the system encoding for input/output streams when no ENCODING specified.

Note: The default/fallback encoding would be ISO-8859-1 (latin-1).

Patch by: Hideo
Tweaked by: me

File:

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

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

@@ -80 +80 @@
    */
   protected int charPos;
-
+  
   // Binary input.
   private BufferedInputStream in;
@@ -91 +91 @@
   }
 
+  public Stream(InputStream inputStream, LispObject elementType)
+    {
+  this(inputStream, elementType, null);
+    }
+
+
   // Input stream constructors.
-  public Stream(InputStream inputStream, LispObject elementType)
+    public Stream(InputStream inputStream, LispObject elementType, String encoding)
   {
     this.elementType = elementType;
@@ -102 +108 @@
           {
             inputStreamReader =
-              new InputStreamReader(inputStream, "ISO-8859-1");
+                    (encoding == null) ?
+                        new InputStreamReader(inputStream)
+                        : new InputStreamReader(inputStream, encoding);
           }
         catch (java.io.UnsupportedEncodingException e)
@@ -128 +136 @@
   }
 
+  public Stream(OutputStream outputStream, LispObject elementType)
+    {
+  this(outputStream, elementType, null);
+    }
+    
   // Output stream constructors.
-  public Stream(OutputStream outputStream, LispObject elementType)
+  public Stream(OutputStream outputStream, LispObject elementType, String encoding)
   {
     this.elementType = elementType;
@@ -137 +150 @@
         try
           {
-            writer = new OutputStreamWriter(outputStream, "ISO-8859-1");
+            writer = (encoding == null) ?
+                new OutputStreamWriter(outputStream)
+                : new OutputStreamWriter(outputStream, encoding);
           }
         catch (java.io.UnsupportedEncodingException e)