Changeset 15444

Timestamp:

10/29/20 16:54:38 (3 years ago)

Author:

Mark Evenson

Message:

Express FILE-DIRECTORY-P in terms of PROBE-DIRECTORY

File:

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

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

@@ -117 +117 @@
             }
             Pathname defaultedPathname = (Pathname)Pathname.MERGE_PATHNAMES.execute(pathname);
+            if (defaultedPathname instanceof JarPathname) {
+              if (defaultedPathname.getName().equals(NIL)
+                  && defaultedPathname.getType().equals(NIL)) {
+                return Symbol.PROBE_FILE.execute(defaultedPathname);
+              }
+              SimpleString lastDirectory = (SimpleString)Symbol.FILE_NAMESTRING.execute(defaultedPathname);
+              LispObject appendedDirectory 
+                = defaultedPathname.getDirectory().reverse().push(lastDirectory).reverse();
+              defaultedPathname.setDirectory(appendedDirectory);
+              return Symbol.PROBE_FILE.execute(defaultedPathname);
+            }
+            
             File file = defaultedPathname.getFile();
-            return file.isDirectory() ? Pathname.getDirectoryPathname(file) : NIL;
+            if (file == null || !file.isDirectory()) {
+              return NIL;
+            }
+
+            if (defaultedPathname.getName().equals(NIL)
+                && defaultedPathname.getType().equals(NIL)) {
+              return Symbol.PROBE_FILE.execute(defaultedPathname);
+            }
+            SimpleString lastDirectory = (SimpleString)Symbol.FILE_NAMESTRING.execute(defaultedPathname);
+            LispObject appendedDirectory 
+              = defaultedPathname.getDirectory().reverse().push(lastDirectory).reverse();
+            defaultedPathname.setDirectory(appendedDirectory);
+            return Symbol.PROBE_FILE.execute(defaultedPathname);
         }
     };
@@ -133 +157 @@
 
         private LispObject isDirectory(Pathname p) {
-            File file = p.getFile();
-            return file.isDirectory() ? T : NIL;
+          LispObject result = PROBE_DIRECTORY.execute(p);
+          return result.equals(NIL) ? NIL : T;
         }