[armedbear-cvs] r12557 - trunk/abcl/src/org/armedbear/lisp

[Alessio Stalla]

Author: astalla
Date: Wed Mar 17 12:55:29 2010
New Revision: 12557

Log:
Added sys::%make-byte-array-input-stream as a "inverse" of sys::%make-byte-array-output-stream


Added:
   trunk/abcl/src/org/armedbear/lisp/ByteArrayInputStream.java
Modified:
   trunk/abcl/src/org/armedbear/lisp/Autoload.java

Modified: trunk/abcl/src/org/armedbear/lisp/Autoload.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Autoload.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Autoload.java	Wed Mar 17 12:55:29 2010
@@ -528,6 +528,7 @@
         autoload(PACKAGE_SYS, "%get-output-stream-bytes", "ByteArrayOutputStream"); //AS 20090325
         autoload(PACKAGE_SYS, "%get-output-stream-array", "ByteArrayOutputStream");
         autoload(PACKAGE_SYS, "%make-array", "make_array");
+        autoload(PACKAGE_SYS, "%make-byte-array-input-stream", "ByteArrayInputStream"); //AS 20100317
         autoload(PACKAGE_SYS, "%make-byte-array-output-stream", "ByteArrayOutputStream"); //AS 20090325
         autoload(PACKAGE_SYS, "%make-condition", "make_condition", true);
         autoload(PACKAGE_SYS, "%make-hash-table", "HashTableFunctions");

Added: trunk/abcl/src/org/armedbear/lisp/ByteArrayInputStream.java
==============================================================================
--- (empty file)
+++ trunk/abcl/src/org/armedbear/lisp/ByteArrayInputStream.java	Wed Mar 17 12:55:29 2010
@@ -0,0 +1,97 @@
+/*
+ * ByteArrayInputStream.java
+ *
+ * Copyright (C) 2010 Alessio Stalla
+ * $Id: ByteArrayInputStream.java 12513 2010-03-02 22:35:36Z ehuelsmann $
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * As a special exception, the copyright holders of this library give you
+ * permission to link this library with independent modules to produce an
+ * executable, regardless of the license terms of these independent
+ * modules, and to copy and distribute the resulting executable under
+ * terms of your choice, provided that you also meet, for each linked
+ * independent module, the terms and conditions of the license of that
+ * module.  An independent module is a module which is not derived from
+ * or based on this library.  If you modify this library, you may extend
+ * this exception to your version of the library, but you are not
+ * obligated to do so.  If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
+
+public final class ByteArrayInputStream extends Stream
+{
+    private final java.io.ByteArrayInputStream byteArrayInputStream;
+
+    public ByteArrayInputStream(byte[] bytes)
+    {
+        this(bytes, UNSIGNED_BYTE_8); //Declared in Stream.java
+    }
+
+    ByteArrayInputStream(byte[] bytes, LispObject elementType)
+    {
+        super(Symbol.SYSTEM_STREAM);
+        this.elementType = elementType;
+        initAsBinaryInputStream(byteArrayInputStream = new java.io.ByteArrayInputStream(bytes));
+    }
+
+    @Override
+    public LispObject typeOf()
+    {
+        return Symbol.STREAM; //TODO
+    }
+
+    @Override
+    public LispObject classOf()
+    {
+        return BuiltInClass.STREAM; //TODO
+    }
+
+    @Override
+    public LispObject typep(LispObject type)
+    {
+        return super.typep(type); //TODO
+    }
+
+    @Override
+    public String toString()
+    {
+        return unreadableString("BYTE-ARRAY-INPUT-STREAM");
+    }
+
+    // ### %make-byte-array-input-stream
+    // %make-byte-array-input-stream bytes &optional element-type => byte-array-input-stream
+    private static final Primitive MAKE_BYTE_ARRAY_INPUT_STREAM =
+        new Primitive("%make-byte-array-input-stream", PACKAGE_SYS, false,
+                       "bytes &optional element-type")
+    {
+
+        @Override
+        public LispObject execute(LispObject bytes) {
+            return new ByteArrayInputStream((byte[]) bytes.javaInstance(byte[].class));
+        }
+
+        @Override
+        public LispObject execute(LispObject bytes, LispObject elementType)
+        {
+            return new ByteArrayInputStream((byte[]) bytes.javaInstance(byte[].class), elementType);
+        }
+    };
+
+}