Changeset 13967

Timestamp:

06/15/12 20:41:56 (9 years ago)

Author:

Mark Evenson

Message:

JAVA:JINPUT-STREAM returns the underlying java.io.InputStream? for any PATHNAME resolved by CL:TRUENAME.

SYS:ENSURE-INPUT-STREAM is the primitive wrapping the execution of Pathname.getInputStream().

My name is <evenson.not.org@…>, and I support this API.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (1 diff)
• Pathname.java (modified) (1 diff)
• Symbol.java (modified) (2 diffs)
• java.lisp (modified) (1 diff)

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

@@ -1065 +1065 @@
               type_error(obj, Symbol.SYMBOL);
   }
-
+  
   public static final LispObject checkList(LispObject obj)
 

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

@@ -2283 +2283 @@
     }
 
+  public static final Primitive GET_INPUT_STREAM = new pf_get_input_stream();
+  @DocString(name="get-input-stream",
+             args="pathname",
+             doc="Returns a java.io.InputStream for resource denoted by PATHNAME.")
+  private static final class pf_get_input_stream extends Primitive {
+    pf_get_input_stream() {
+      super("ensure-input-stream", PACKAGE_SYS, true);
+    }
+    @Override
+    public LispObject execute(LispObject pathname) {
+      Pathname p = (Pathname) coerceToPathname(pathname);
+      return new JavaObject(p.getInputStream());
+    }
+  };
+
+
     public InputStream getInputStream() {
         InputStream result = null;

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

@@ -3065 +3065 @@
   public static final Symbol JCLASS_OF =
     PACKAGE_JAVA.addExternalSymbol("JCLASS-OF");
+  public static final Symbol JINPUT_STREAM =
+    PACKAGE_JAVA.addExternalSymbol("JINPUT-STREAM");
   public static final Symbol JMETHOD_RETURN_TYPE =
     PACKAGE_JAVA.addExternalSymbol("JMETHOD-RETURN-TYPE");
@@ -3085 +3087 @@
   public static final Symbol FLOAT_OVERFLOW_MODE =
     PACKAGE_SYS.addExternalSymbol("FLOAT-OVERFLOW-MODE");
+  public static final Symbol ENSURE_INPUT_STREAM =
+    PACKAGE_SYS.addExternalSymbol("ENSURE-INPUT-STREAM");
   public static final Symbol CLASS_BYTES =
     PACKAGE_SYS.addExternalSymbol("CLASS-BYTES");

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

@@ -514 +514 @@
   (error "make-instance not supported for ~S" class))
 
+(defun jinput-stream (pathname)
+  "Returns a java.io.InputStream for resource denoted by PATHNAME."
+  (sys:ensure-input-stream pathname))
+
 (provide "JAVA")
+