[armedbear-cvs] r12609 - trunk/abcl/src/org/armedbear/lisp
Mark Evenson
mevenson at common-lisp.net
Thu Apr 15 14:27:23 UTC 2010
Author: mevenson
Date: Thu Apr 15 10:27:22 2010
New Revision: 12609
Log:
Add missing implementation of JAR-STREAM and URL-STREAM.
Added:
trunk/abcl/src/org/armedbear/lisp/JarStream.java
trunk/abcl/src/org/armedbear/lisp/URLStream.java
Added: trunk/abcl/src/org/armedbear/lisp/JarStream.java
==============================================================================
--- (empty file)
+++ trunk/abcl/src/org/armedbear/lisp/JarStream.java Thu Apr 15 10:27:22 2010
@@ -0,0 +1,150 @@
+/*
+ * JarStream.java
+ *
+ * Copyright (C) 2010 Mark Evenson
+ * $Id: FileStream.java 12422 2010-02-06 10:52:32Z mevenson $
+ *
+ * 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.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+
+/**
+ * Stream interface for an entry in a jar pathname.
+ *
+ * This only supports reading from the stream.
+ */
+public final class JarStream extends Stream
+{
+ private final Pathname pathname;
+ private final InputStream input;
+ private final Reader reader;
+ private final int bytesPerUnit;
+
+ public JarStream(Pathname pathname, String namestring,
+ LispObject elementType, LispObject direction,
+ LispObject ifExists, LispObject format)
+ throws IOException
+ {
+ super(Symbol.JAR_STREAM);
+ Debug.assertTrue(direction == Keyword.INPUT);
+ Debug.assertTrue(pathname.name != NIL);
+ isInputStream = true;
+
+ super.setExternalFormat(format);
+
+ this.pathname = pathname;
+ this.elementType = elementType;
+
+ this.input = pathname.getInputStream();
+ if (elementType == Symbol.CHARACTER || elementType == Symbol.BASE_CHAR) {
+ isCharacterStream = true;
+ bytesPerUnit = 1;
+ InputStreamReader isr = new InputStreamReader(input);
+ this.reader = (Reader) new BufferedReader(isr);
+ initAsCharacterInputStream(this.reader);
+ } else {
+ isBinaryStream = true;
+ int width = Fixnum.getValue(elementType.cadr());
+ bytesPerUnit = width / 8;
+ this.reader = null;
+ initAsBinaryInputStream(this.input);
+ }
+ }
+
+ @Override
+ public LispObject typeOf()
+ {
+ return Symbol.JAR_STREAM;
+ }
+
+ @Override
+ public LispObject classOf()
+ {
+ return BuiltInClass.JAR_STREAM;
+ }
+
+ @Override
+ public LispObject typep(LispObject typeSpecifier)
+ {
+ if (typeSpecifier == Symbol.JAR_STREAM)
+ return T;
+ if (typeSpecifier == BuiltInClass.JAR_STREAM)
+ return T;
+ return super.typep(typeSpecifier);
+ }
+
+ @Override
+ public void setExternalFormat(LispObject format) {
+ super.setExternalFormat(format);
+ }
+
+ public Pathname getPathname()
+ {
+ return pathname;
+ }
+
+ @Override
+ public void _close()
+ {
+ try {
+ if (input != null) {
+ input.close();
+ }
+ if (reader != null) {
+ reader.close();
+ }
+ setOpen(false);
+ }
+ catch (IOException e) {
+ error(new StreamError(this, e));
+ }
+ }
+
+ @Override
+ public String writeToString()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append(Symbol.JAR_STREAM.writeToString());
+ String namestring = pathname.getNamestring();
+ if (namestring != null) {
+ sb.append(" ");
+ sb.append(namestring);
+ }
+ return unreadableString(sb.toString());
+ }
+}
Added: trunk/abcl/src/org/armedbear/lisp/URLStream.java
==============================================================================
--- (empty file)
+++ trunk/abcl/src/org/armedbear/lisp/URLStream.java Thu Apr 15 10:27:22 2010
@@ -0,0 +1,149 @@
+/*
+ * URLStream.java
+ *
+ * Copyright (C) 2010 Mark Evenson
+ * $Id: FileStream.java 12422 2010-02-06 10:52:32Z mevenson $
+ *
+ * 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.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+
+/**
+ * Stream interface for a URL.
+ *
+ * This only supports reading from the stream.
+ */
+public final class URLStream extends Stream
+{
+ private final Pathname pathname;
+ private final InputStream input;
+ private final Reader reader;
+ private final int bytesPerUnit;
+
+ public URLStream(Pathname pathname, String namestring,
+ LispObject elementType, LispObject direction,
+ LispObject ifExists, LispObject format)
+ throws IOException
+ {
+ super(Symbol.URL_STREAM);
+ Debug.assertTrue(direction == Keyword.INPUT);
+ isInputStream = true;
+
+ super.setExternalFormat(format);
+
+ this.pathname = pathname;
+ this.elementType = elementType;
+
+ this.input = pathname.getInputStream();
+ if (elementType == Symbol.CHARACTER || elementType == Symbol.BASE_CHAR) {
+ isCharacterStream = true;
+ bytesPerUnit = 1;
+ InputStreamReader isr = new InputStreamReader(input);
+ this.reader = (Reader) new BufferedReader(isr);
+ initAsCharacterInputStream(this.reader);
+ } else {
+ isBinaryStream = true;
+ int width = Fixnum.getValue(elementType.cadr());
+ bytesPerUnit = width / 8;
+ this.reader = null;
+ initAsBinaryInputStream(this.input);
+ }
+ }
+
+ @Override
+ public LispObject typeOf()
+ {
+ return Symbol.URL_STREAM;
+ }
+
+ @Override
+ public LispObject classOf()
+ {
+ return BuiltInClass.URL_STREAM;
+ }
+
+ @Override
+ public LispObject typep(LispObject typeSpecifier)
+ {
+ if (typeSpecifier == Symbol.URL_STREAM)
+ return T;
+ if (typeSpecifier == BuiltInClass.URL_STREAM)
+ return T;
+ return super.typep(typeSpecifier);
+ }
+
+ @Override
+ public void setExternalFormat(LispObject format) {
+ super.setExternalFormat(format);
+ }
+
+ public Pathname getPathname()
+ {
+ return pathname;
+ }
+
+ @Override
+ public void _close()
+ {
+ try {
+ if (input != null) {
+ input.close();
+ }
+ if (reader != null) {
+ reader.close();
+ }
+ setOpen(false);
+ }
+ catch (IOException e) {
+ error(new StreamError(this, e));
+ }
+ }
+
+ @Override
+ public String writeToString()
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append(Symbol.URL_STREAM.writeToString());
+ String namestring = pathname.getNamestring();
+ if (namestring != null) {
+ sb.append(" ");
+ sb.append(namestring);
+ }
+ return unreadableString(sb.toString());
+ }
+}
More information about the armedbear-cvs
mailing list