[armedbear-cvs] r11766 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Apr 19 04:33:29 2009
New Revision: 11766

Log:
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.


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

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Sun Apr 19 04:33:29 2009
@@ -1152,8 +1152,11 @@
         Pathname p;
         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;
         else