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

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri May 27 06:06:26 2011
New Revision: 13302

Log:
Include the version in the internal PATHNAME copy contructor.

With this change, MERGE-PATHNAMES should now follow ANSI for version
arguments, finally closing ticket #150.

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	Fri May 27 06:06:17 2011	(r13301)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Fri May 27 06:06:26 2011	(r13302)
@@ -168,6 +168,15 @@
                 Debug.assertTrue(false);
             }
         }
+	if (p.version != NIL) {
+	    if (p.version instanceof Symbol) {
+		version = p.version;
+	    } else if (p.version instanceof LispInteger) {
+		version = p.version;
+	    } else {
+		Debug.assertTrue(false);
+	    }
+	}
     }
 
     public Pathname(String s) {