Changeset 11766

Timestamp:

04/19/09 08:33:29 (14 years ago)

Author:

ehuelsmann

Message:

In MERGE-PATHNAMES, if the pathname to be returned is of type PATHNAME,
resolve PATHNAME-DEFAULTS to a PATHNAME, if it's a LOGICAL-PATHNAME.

Fixes COMPILE-FILE.17 and COMPILE-FILE.18 ANSI tests.

File:

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

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

@@ -1153 +1153 @@
         if (pathname instanceof LogicalPathname)
             p = new LogicalPathname();
-        else
+        else {
             p = new Pathname();
+            if (defaultPathname instanceof LogicalPathname)
+                defaultPathname = LogicalPathname.translateLogicalPathname((LogicalPathname)defaultPathname);
+        }
         if (pathname.host != NIL)
             p.host = pathname.host;