Have coerceToPathname use Gray stream PATHNAME generic

armedbear · Dec 21, 2023 · e29e40c · e29e40c
1 parent c7118e2
commit e29e40c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/src/org/armedbear/lisp/GrayStream.java b/src/org/armedbear/lisp/GrayStream.java
@@ -226,6 +226,14 @@ public LispObject fileLength() {
     return f.execute(clos);
   }
 
+  public static final Symbol PATHNAME
+    = PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/PATHNAME");
+  @Override
+  public Pathname getPathname() {
+    Function f = checkFunction(PATHNAME.getSymbolFunction());
+    return (Pathname)f.execute(clos);
+  }
+
   public static final Symbol LINE_COLUMN
     = PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/LINE-COLUMN");
   public int getCharPos() {
@@ -295,6 +303,7 @@ public void _clearInput() {
     Autoload.autoloadFile(GrayStream.FINISH_OUTPUT, "gray-streams-java");
     Autoload.autoloadFile(GrayStream.FILE_POSITION, "gray-streams-java");
     Autoload.autoloadFile(GrayStream.FILE_LENGTH, "gray-streams-java");
+    Autoload.autoloadFile(GrayStream.PATHNAME, "gray-streams-java");
     Autoload.autoloadFile(GrayStream.LINE_COLUMN, "gray-streams-java");
   }
 }
diff --git a/src/org/armedbear/lisp/Lisp.java b/src/org/armedbear/lisp/Lisp.java
@@ -2143,12 +2143,10 @@ public static Pathname coerceToPathname(LispObject arg)
       return (Pathname) arg;
     if (arg instanceof AbstractString)
       return (Pathname)Pathname.create(((AbstractString)arg).toString());
-    if (arg instanceof FileStream)
-      return ((FileStream)arg).getPathname();
-    if (arg instanceof JarStream)
-      return ((JarStream)arg).getPathname();
-    if (arg instanceof URLStream)
-      return ((URLStream)arg).getPathname();
+    Stream s = checkStream(arg);
+    Pathname p = s.getPathname();
+    if (p != null)
+      return p;
     type_error(arg, list(Symbol.OR,
                          Symbol.STRING,
                          Symbol.PATHNAME, Symbol.JAR_PATHNAME, Symbol.URL_PATHNAME,

diff --git a/src/org/armedbear/lisp/Stream.java b/src/org/armedbear/lisp/Stream.java
@@ -1821,6 +1821,11 @@ protected int _readChar() throws IOException {
         return n;
     }
 
+    public Pathname getPathname()
+    {
+        return null;
+    }
+
     /** Puts a character back into the (underlying) stream
      *
      * @param n

diff --git a/src/org/armedbear/lisp/gray-streams-java.lisp b/src/org/armedbear/lisp/gray-streams-java.lisp
@@ -67,6 +67,9 @@
 (defun java/file-length (object)
   (gray-streams:stream-file-length object))
 
+(defun java/pathname (object)
+  (gray-streams::gray-pathname object))
+
 (defun java/line-column (object)
   (gray-streams:stream-line-column object))