Changeset 11407

Timestamp:

11/30/08 21:54:52 (15 years ago)

Author:

ehuelsmann

Message:

Allow for null ENCODING values: they mean "default".

Location:

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

Files:

• socket.lisp (modified) (2 diffs)
• socket_stream.java (modified) (1 diff)
• util/RandomAccessCharacterFile.java (modified) (1 diff)

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

@@ -32 +32 @@
 (in-package "SYSTEM")
 
-(defun get-socket-stream (socket &key (element-type 'character))
+(defun get-socket-stream (socket &key (element-type 'character) (external-format :default))
   ":ELEMENT-TYPE must be CHARACTER or (UNSIGNED-BYTE 8); the default is CHARACTER."
   (cond ((eq element-type 'character))
@@ -40 +40 @@
                 :format-control
                 ":ELEMENT-TYPE must be CHARACTER or (UNSIGNED-BYTE 8).")))
-  (%socket-stream socket element-type))
+  (%socket-stream socket element-type external-format))
 
 (defun make-socket (host port)

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

@@ -41 +41 @@
     private socket_stream()
     {
-        super("%socket-stream", PACKAGE_SYS, false, "socket element-type");
+        super("%socket-stream", PACKAGE_SYS, false, "socket element-type external-format");
     }
 
-    public LispObject execute(LispObject first, LispObject second)
+    static final private Symbol keywordCodePage = Packages.internKeyword("CODE-PAGE");
+
+    public LispObject execute(LispObject first, LispObject second, LispObject third)
         throws ConditionThrowable
     {
         Socket socket = (Socket) ((JavaObject)first).getObject();
         LispObject elementType = second; // Checked by caller.
+  LispObject externalFormat = third;
+  String encoding = "ISO-8859-1"; // for default
+  if (externalFormat != NIL) {
+      if (externalFormat instanceof Symbol) {
+    Symbol enc = (Symbol)externalFormat; //FIXME: class cast exception to be caught
+    if (enc != NIL) {
+        if (enc != keywordCodePage) {
+      encoding = enc.getName();
+        }
+        //FIXME: the else for the keywordCodePage to be filled in
+    }
+    //FIXME: the else for the == NIL to be filled in: raise an error...
+      } else if (externalFormat instanceof AbstractString) {
+    AbstractString encName = (AbstractString) externalFormat;
+    encoding = encName.getStringValue();
+      }
+  }
         try {
              Stream in =
-                 new Stream(socket.getInputStream(), elementType);
+                 new Stream(socket.getInputStream(), elementType, encoding);
              Stream out =
-                 new Stream(socket.getOutputStream(), elementType);
+                 new Stream(socket.getOutputStream(), elementType, encoding);
              return new SocketStream(socket, in, out);
         }

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

@@ -174 +174 @@
   fcnpos = fcn.position();
   fcnsize = fcn.size();
-    
-  cset = Charset.forName(encoding);
+  
+  cset = (encoding == null) ? Charset.defaultCharset() : Charset.forName(encoding);
   cdec = cset.newDecoder();
   cenc = cset.newEncoder();