Changeset 15490

Timestamp:

11/30/20 08:22:33 (2 years ago)

Author:

Mark Evenson

Message:

Implement EXT:AS-JAR-PATHNAME-ARCHIVE

AS-JAR-PATHNAME-ARCHIVE returns its argument as a JAR-PATHNAME archive.

File:

• trunk/abcl/src/org/armedbear/lisp/JarPathname.java (modified) (1 diff)

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

@@ -99 +99 @@
     return result;
   }
+
+  @DocString(name="as-jar-pathname-archive",
+             args="pathname",
+             returns="jar-pathname",
+             doc="Returns PATHNAME as a reference to a JAR-PATHNAME archive"
+             + "\n"
+             + "If PATHNAME names an ordinary file, the resulting JAR-PATHNAME addresses the"
+             + "file as an archive.  If PATHNAME names an entry in an archive, the resulting"
+             + "JAR-PATHNAME addresses that entry as a zip archive within that archive.")
+  private static final Primitive AS_JAR_PATHNAME_ARCHIVE = new pf_as_jar_pathname_archive();
+  private static class pf_as_jar_pathname_archive extends Primitive {
+    pf_as_jar_pathname_archive() {
+      super("as-jar-pathname-archive", PACKAGE_EXT, true);
+    }
+    @Override
+    public LispObject execute(LispObject arg) {
+      if (arg instanceof AbstractString) {
+        arg = coerceToPathname(arg);
+      }
+      if (arg instanceof JarPathname) {
+        return createFromEntry((JarPathname)arg);
+      } if (arg instanceof Pathname) {
+        return createFromPathname((Pathname)arg);
+      }
+      type_error(arg,
+                 list(Symbol.OR,
+                      Symbol.PATHNAME, Symbol.URL_PATHNAME,
+                      Symbol.JAR_PATHNAME));
+      return (LispObject)UNREACHED;
+    }
+  };
     
   static public JarPathname createFromFile(String s) {