Changeset 15460

Timestamp:

10/29/20 16:55:04 (3 years ago)

Author:

Mark Evenson

Message:

Address points in review from @rec

<​https://github.com/armedbear/abcl/pull/335#pullrequestreview-518434813>

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• JarPathname.java (modified) (4 diffs)
• ZipCache.java (modified) (1 diff)

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

@@ -346 +346 @@
     if (!(jars instanceof Cons)) {
       type_error("JAR-PATHNAME device is not a cons",
-                 jars,
-                 Symbol.CONS);
+                 jars, Symbol.CONS);
       return (LispObject)UNREACHED;
     }
@@ -374 +373 @@
     p.copyFrom(pathname);
 
-    // Run a truename resolution on the path of local jar archives
+    // Run truename resolution on the path of local jar archives
     if (p.isLocalFile()) {
       Pathname rootJar;
@@ -396 +395 @@
   return Pathname.doTruenameExit(rootJar, errorIfDoesNotExist);
       }
-      LispObject otherJars
-        = p.getJars().cdr();
+      LispObject otherJars = p.getJars().cdr();
       URLPathname newRootJar;
       if (rootJarTruename instanceof Pathname) {
@@ -425 +423 @@
   public boolean isLocalFile() {
     Pathname p = (Pathname) getRootJar();
-    if (p.isLocalFile()) {
-      return true;
+    if (p != null) {
+      return p.isLocalFile();
     }
     return false;

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

@@ -422 +422 @@
     if (innerJars.equals(NIL)) {
       return getArchiveFile(jar);
-    } else {
-      result = getArchiveStreamFromFile(jar);
-      cache.put(result.root, result); 
-
-      JarPathname nextArchive = new JarPathname();
-      nextArchive
-        .setDevice(new Cons(rootJar,
-                            new Cons(innerJars.car(), NIL)))
-        .setDirectory(NIL)
-        .setName(NIL)
-        .setType(NIL);
+    } 
+
+    result = getArchiveStreamFromFile(jar);
+    cache.put(result.root, result); 
+
+    JarPathname nextArchive = new JarPathname();
+    nextArchive
+      .setDevice(new Cons(rootJar,
+                          new Cons(innerJars.car(), NIL)))
+      .setDirectory(NIL)
+      .setName(NIL)
+      .setType(NIL);
       
+    innerJars = innerJars.cdr();
+    while (innerJars.car() != NIL) {
+      Pathname nextJarArchive = (Pathname)innerJars.car();
+      
+      JarPathname nextAsEntry = new JarPathname();
+      nextAsEntry
+        .setDevice(nextArchive.getDevice())
+        .setDirectory(nextJarArchive.getDirectory())
+        .setName(nextJarArchive.getName())
+        .setType(nextJarArchive.getType());
+      // FIXME
+      // The pathnames for subsquent entries in a PATHNAME-JAR
+      // are relative.  Should they be?
+      LispObject directories = nextAsEntry.getDirectory();
+      if ( !directories.equals(NIL)
+           && directories.car().equals(Keyword.RELATIVE)) {
+        directories = directories.cdr().push(Keyword.ABSOLUTE);
+        nextAsEntry.setDirectory(directories);
+      }
+
+      nextArchive.setDevice(nextArchive.getDevice().reverse().push(nextJarArchive).reverse());
+      ArchiveStream stream = (ArchiveStream) result;
+
+      ZipEntry entry = stream.getEntry(nextAsEntry);
+      if (entry == null) {
+        return null;
+      }
+      
+      InputStream inputStream = stream.getEntryAsInputStream(nextAsEntry);
+      if (inputStream == null) {
+        return null;
+      }
+      stream = new ArchiveStream(inputStream, nextArchive, entry);
+      result = stream;
+      cache.put(nextArchive, result); 
+
       innerJars = innerJars.cdr();
-      while (innerJars.car() != NIL) {
-        Pathname nextJarArchive = (Pathname)innerJars.car();
-
-        JarPathname nextAsEntry = new JarPathname();
-        nextAsEntry
-          .setDevice(nextArchive.getDevice())
-          .setDirectory(nextJarArchive.getDirectory())
-          .setName(nextJarArchive.getName())
-          .setType(nextJarArchive.getType());
-        // FIXME 
-        // The pathnames for subsquent entries in a PATHNAME-JAR are relative.  Should they be?
-        if (nextAsEntry.getDirectory().car().equals(Keyword.RELATIVE)) {
-          LispObject directories = nextAsEntry.getDirectory();
-          directories = directories.cdr();
-          directories = directories.push(Keyword.ABSOLUTE);
-          nextAsEntry.setDirectory(directories);
-        }
-        nextArchive.setDevice(nextArchive.getDevice().reverse().push(nextJarArchive).reverse());
-        ArchiveStream stream = (ArchiveStream) result;
-
-        ZipEntry entry = stream.getEntry(nextAsEntry);
-        if (entry == null) {
-          return null;
-        }
-        
-        InputStream inputStream = stream.getEntryAsInputStream(nextAsEntry);
-        if (inputStream == null) {
-          return null;
-        }
-        stream = new ArchiveStream(inputStream, nextArchive, entry);
-        result = stream;
-        cache.put(nextArchive, result); 
-
-        innerJars = innerJars.cdr();
-        if (innerJars.cdr().equals(NIL)
-            && (!jar.getDirectory().equals(NIL)
-                || !jar.getName().equals(NIL)
-                || !jar.getType().equals(NIL))) {
-          simple_error("Currently unimplemented retrieval of an entry in a nested pathnames");
-          return (Archive)UNREACHED;
-        }
-      }
-
-      return result;
-    }
+      if (innerJars.cdr().equals(NIL)
+          && (!jar.getDirectory().equals(NIL)
+              && jar.getName().equals(NIL)
+              && jar.getType().equals(NIL))) {
+        simple_error("Currently unimplemented retrieval of an entry in a nested pathnames");
+        return (Archive)UNREACHED;
+      }
+    }
+    return result;
   }