Changeset 12531

Timestamp:

03/14/10 13:30:17 (14 years ago)

Author:

Mark Evenson

Message:

Change jar pathname to have :ABSOLUTE directory entries.

As pointed out by Alan Ruttenburg and Alessio Stalla, having :RELATIVE
directory entries is contrary to the semantics of the CLHS and
violates the convention common in Common Lisp that the TRUENAME of a
pathname directory will be absolute.

Location:

trunk/abcl

Files:

• doc/design/pathnames/abcl-jar-url.text (modified) (7 diffs)
• src/org/armedbear/lisp/Pathname.java (modified) (6 diffs)
• src/org/armedbear/lisp/ZipCache.java (modified) (1 diff)
• test/lisp/abcl/jar-file.lisp (modified) (6 diffs)

trunk/abcl/doc/design/pathnames/abcl-jar-url.text

@@ -3 +3 @@
 
 Mark Evenson
-Created: 09 JAN 2010
-Modified: 22 FEB 2010
+Created:  09 JAN 2010
+Modified: 16 MAR 2010 
 
 Notes towards sketching an implementation of "jar:" references to be
@@ -91 +91 @@
     
 *   The DIRECTORY component of a JAR PATHNAME should be a list starting
-    with the :RELATIVE keyword, as hierarchial entries in jar files
-    are of the form "foo/bar/a.lisp" not "/foo/bar/a.lisp"
+    with the :ABSOLUTE keyword.  Even though hierarchial entries in
+    jar files are stored in the form "foo/bar/a.lisp" not
+    "/foo/bar/a.lisp", the meaning of DIRECTORY component better
+    represented as an absolute path.
 
 BNF
@@ -109 +111 @@
                      | RELATIVE-FILE-NAMESTRING
 
-  ENTRY ::= [ DIRECTORY "/"] * FILE
+  ENTRY ::= [ DIRECTORY "/"]* FILE
 
 
@@ -175 +177 @@
     }
     pathname {
-      directory: (:RELATIVE "b")
+      directory: (:RELATIVE "b" "c")
       name: "foo"
       type: "abcl"
@@ -187 +189 @@
 // UC5 -- JAR Entry in a JAR Entry
 pathname: {
-  namestring: "jar:jar:file:a/foo/baz.jar!/foo.abcl!/a/b/bar-1.cls"
+  namestring: "jar:jar:file:a/foo/baz.jar!/c/d/foo.abcl!/a/b/bar-1.cls"
   device: (
     pathname: {
-      device: "jar:file:"
+      directory: (:RELATIVE "a" "foo")
       name: "baz"
       type: "jar"
     }
     pathname: {
+      directory: (:RELATIVE "c" "d")
       name: "foo"
       type: "abcl"
     }
   )
+  directory: (:ABSOLUTE "a" "b")
   name: "bar-1"
   type: "cls"
@@ -209 +213 @@
     "http://example.org/abcl.jar"
     pathname: {
-      directory: (:relative "org" "armedbear" "lisp")
+      directory: (:RELATIVE "org" "armedbear" "lisp")
       name: "Version"
       type: "class"
@@ -250 +254 @@
      type: "jar"
    )
-   directory: (:RELATIVE "c" "d")
+   directory: (:ABSOLUTE "c" "d")
    name: "foo"
    type: "lisp

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

@@ -297 +297 @@
                 device = d.device;
             }
-            s = s.substring(separatorIndex + jarSeparator.length());
+            s = "/" + s.substring(separatorIndex + jarSeparator.length());
             Pathname p = new Pathname(s);
             directory = p.directory;
@@ -533 +533 @@
             Debug.assertTrue(false);
         }
-        sb.append(getDirectoryNamestring());
+        String directoryNamestring = getDirectoryNamestring();
+        if (isJar()) {
+            if (directoryNamestring.startsWith(File.separator)) {
+                sb.append(directoryNamestring.substring(1));
+            }
+        } else {
+            sb.append(directoryNamestring);
+        }
         if (name instanceof AbstractString) {
             String n = name.getStringValue();
@@ -636 +643 @@
         p.type = type;
         String path = p.getNamestring();
+        StringBuilder result = new StringBuilder();
         if (Utilities.isPlatformWindows) {
-      StringBuilder result = new StringBuilder();
       for (int i = 0; i < path.length(); i++) {
     char c = path.charAt(i);
@@ -647 +654 @@
       }
       return result.toString();
-        }
-        return path;
+        } else  {
+            result.append(path);
+        }
+        // Entries in jar files are always relative, but Pathname
+        // directories are :ABSOLUTE.
+        if (result.length() > 1
+          && result.substring(0, 1).equals("/")) {
+            return result.substring(1);
+        }
+        return result.toString();
     }
 
@@ -1590 +1605 @@
         }
 
-        // A JAR always has relative directories
-        if (result.isJar()
-            && result.directory instanceof Cons
-            && result.directory.car().equals(Keyword.ABSOLUTE)) {
-            if (result.directory.cdr().equals(NIL)) {
-                result.directory = NIL;
-            } else {
-                ((Cons)result.directory).car = Keyword.RELATIVE;
-            }
-        }
+        // A JAR always has absolute directories
+        // if (result.isJar()
+        //     && result.directory instanceof Cons
+        //     && result.directory.car().equals(Keyword.ABSOLUTE)) {
+        //     if (result.directory.cdr().equals(NIL)) {
+        //         result.directory = NIL;
+        //     } else {
+        //         ((Cons)result.directory).car = Keyword.RELATIVE;
+        //     }
+        // }
 
         if (pathname.name != NIL) {
@@ -1708 +1723 @@
         if (pathname.isWild()) {
             return error(new FileError("Bad place for a wild pathname.",
-              pathname));
+                                       pathname));
         }
         if (!(pathname.device instanceof Cons)) {

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

@@ -160 +160 @@
                 Date date = null;
                 try {
+                    if (dateString == null) {
+                        throw new ParseException("Failed to get HEAD for " + url, 0);
+                    }
                     date = RFC_1123.parse(dateString);
                     long current = date.getTime();

trunk/abcl/test/lisp/abcl/jar-file.lisp

@@ -131 +131 @@
 ;;; wrapped in PROGN for easy disabling without a network connection
 ;;; XXX come up with a better abstraction
+
 (progn 
   (deftest jar-file.load.11
@@ -245 +246 @@
        (pathname-directory p) (pathname-name p) (pathname-type p)))
   "baz" "jar"
-   nil "foo" "abcl")
+   (:absolute) "foo" "abcl")
    
 (deftest jar-file.pathname.3
@@ -267 +268 @@
   (:relative "a") "baz" "jar"
   (:relative "b" "c") "foo" "abcl"
-  (:relative "this" "that") "foo-20" "cls")
+  (:absolute "this" "that") "foo-20" "cls")
 
 (deftest jar-file.pathname.5
@@ -279 +280 @@
   (:relative "a" "foo" ) "baz" "jar"
   (:relative "b" "c") "foo" "abcl"
-  (:relative "armed" "bear") "bar-1" "cls")
+  (:absolute "armed" "bear") "bar-1" "cls")
 
 (deftest jar-file.pathname.6
@@ -289 +290 @@
        (pathname-directory p) (pathname-name p) (pathname-type p)))
   "http://example.org/abcl.jar" 
-  (:relative "org" "armedbear" "lisp") "Version" "class")
+  (:absolute "org" "armedbear" "lisp") "Version" "class")
 
 (deftest jar-file.pathname.7
@@ -317 +318 @@
        (pathname-directory d) (pathname-name d) (pathname-type d)
        (pathname-directory p) (pathname-name p) (pathname-type p)))
-  (:RELATIVE "a" "b") "foo" "jar"
-  (:RELATIVE "c" "d") "foo" "lisp")
+  (:relative "a" "b") "foo" "jar"
+  (:absolute "c" "d") "foo" "lisp")