Changeset 15448

Timestamp:

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

Author:

Mark Evenson

Message:

Fix ANSI TEST DIRECTORY.8

Static methods need to explicitly check type

When merging with JarPathname? as default the directory is always absolute

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Pathname.java (modified) (2 diffs)
• URLPathname.java (modified) (2 diffs)

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

@@ -54 +54 @@
   }
 
-  protected static Pathname create(Pathname p) {
+  public static Pathname create(Pathname p) {
     if (p instanceof JarPathname) {
-      return (JarPathname)JarPathname.create(p.getNamestring());
+      return JarPathname.create((JarPathname)p);
     } else if (p instanceof URLPathname) {
-      return (URLPathname)URLPathname.create(((URLPathname)p).getNamestringAsURL());
+      return URLPathname.create((URLPathname)p);
+    } else if (p instanceof LogicalPathname) {
+      return LogicalPathname.create((LogicalPathname)p);
     } else {
-      return new Pathname(p);
+      return new Pathname((Pathname)p);
     }
   }
@@ -1729 +1731 @@
       } else {
         result.setDirectory(mergeDirectories(p.getDirectory(), d.getDirectory()));
+        // Directories are always absolute in a JarPathname
+        if (result instanceof JarPathname) {
+          LispObject directories = result.getDirectory();
+          if ((!directories.car().equals(NIL))
+              && directories.car().equals(Keyword.RELATIVE)) {
+            directories = directories.cdr().push(Keyword.ABSOLUTE);
+            result.setDirectory(directories);
+          }
+        }
       }
       

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

@@ -60 +60 @@
 
   public static URLPathname create(Pathname p) {
+    if (p instanceof URLPathname) {
+      URLPathname result = new URLPathname();
+      result.copyFrom(p);
+      return result;
+    }
     return (URLPathname)createFromFile((Pathname)p);
-  }
-
-  public static URLPathname create(URLPathname p) {
-    URLPathname result = new URLPathname();
-    result.copyFrom(p);
-    return result;
   }
 
@@ -230 +229 @@
   
   static public boolean hasExplicitFile(Pathname p) {
+    if (!p.getHost().listp()) {
+        return false;
+    }
     LispObject scheme = Symbol.GETF.execute(p.getHost(), SCHEME, NIL);
     return scheme.equalp(FILE);