Changeset 15442

Timestamp:

10/29/20 16:54:36 (2 years ago)

Author:

Mark Evenson

Message:

MERGE-PATHNAMES downcasts to URLPathname result when appropiate

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (2 diffs)

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

@@ -1728 +1728 @@
       }
 
-      // Merge the directory of a relative JAR-PATHNAME with the
-      // default directory.  
-      // if (pathname.isJar()) {
-      //   Pathname root = ((JarPathname)result).getRootJar();
-        
-
-      //   LispObject jar = jars.car;
-      //   if (jar instanceof Pathname) {
-      //     Pathname defaults = Pathname.create(d);
-      //     if (defaults.isJar()) {
-      //       defaults.setDevice(NIL);
-      //     }
-      //     Pathname o = mergePathnames((Pathname)jar, defaults);
-      //     if (o.getDirectory() instanceof Cons
-      //         && ((Cons)o.getDirectory()).length() == 1) { // i.e. (:ABSOLUTE) or (:RELATIVE)
-      //       o.setDirectory(NIL);
-      //     }
-      //     ((Cons)result.device).car = o;
-      //   }
-      //   result.setDirectory(p.getDirectory());
-      // } else {
-      //   result.setDirectory(mergeDirectories(p.getDirectory(), d.getDirectory()));
-      // }
-
       if (pathname.isJar()) {
         result.setDirectory(p.getDirectory());
@@ -1822 +1798 @@
         }
       }
+      // Downcast to URLPathname if resolving a URLPathname
+      if (result instanceof Pathname
+          && URLPathname.hasExplicitFile(result)) {
+        URLPathname downcastResult = new URLPathname();
+        downcastResult.copyFrom(result);
+        result = downcastResult;
+      }
+          
       return result;
     }