Changeset 12612

Timestamp:

04/15/10 14:50:33 (14 years ago)

Author:

Mark Evenson

Message:

Incremental checkpoint on making JAR pathnames use the new URL pathname.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Cons.java (modified) (1 diff)
• Pathname.java (modified) (24 diffs)
• Utilities.java (modified) (2 diffs)
• ZipCache.java (modified) (1 diff)

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

@@ -69 +69 @@
       result = result.push(rest.car());
       if (rest.cdr() == NIL) {
-        result = result.push(NIL);
         break;
       }

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

@@ -98 +98 @@
                 device = new Cons(NIL, NIL);
                 LispObject first = jars.car();
-                if (first instanceof SimpleString) {
-                    ((Cons)device).car = new SimpleString(((SimpleString)first).getStringValue());
-                } else if (first instanceof Pathname) {
+                if (first instanceof Pathname) {
                     ((Cons)device).car = new Pathname((Pathname)first);
                 } else {
@@ -214 +212 @@
     static final Symbol SCHEME = internKeyword("SCHEME");
     static final Symbol AUTHORITY = internKeyword("AUTHORITY");
+    static final Symbol QUERY = internKeyword("QUERY");
+    static final Symbol FRAGMENT = internKeyword("FRAGMENT");
 
     static final private String jarSeparator = "!/";
@@ -249 +249 @@
                 type = p.type;
                 version = p.version;
+                invalidateNamestring();
                 return;
             }
@@ -266 +267 @@
                 s = s.substring("jar:".length(), i + jarSeparator.length());
                 Pathname p = new Pathname(s);
-                LispObject first = ((Cons) p.device).car();
-                if (first instanceof AbstractString) {
-                    jars = jars.push(first);
-                } else {
-                    jars = jars.push(p.device.car());
-                }
+                jars = jars.push(p.device.car());
             }
             if (jar.startsWith("jar:file:")) {
-                String jarString = jar.substring("jar:".length(),
-                  jar.length() - jarSeparator.length());
+                String jarString 
+                    = jar.substring("jar:".length(),
+                                    jar.length() - jarSeparator.length());
                 // Use URL constructor to normalize Windows' use of device
                 URL url = null;
@@ -286 +283 @@
                 }
                 Pathname jarPathname = new Pathname(url);
-                if (jarString.endsWith(jarSeparator)) {
-                    jars = jars.push(jarPathname.device);
-                } else {
-                    jars = jars.push(jarPathname);
-                }
+                jars = jars.push(jarPathname);
             } else {
                 URL url = null;
                 try {
                     url = new URL(jar.substring("jar:".length(), jar.length() - 2));
-                    jars = jars.push(new SimpleString(url.toString()));
+                    Pathname p = new Pathname(url);
+                    jars = jars.push(p);
                 } catch (MalformedURLException e) {
-                    error(new LispError("Failed to parse url '" + url + "'"
-                      + e.getMessage()));
+                    error(new LispError("Failed to parse URL "
+                                        + "'" + url + "'"
+                                        + e.getMessage()));
                 }
             }
             jars = jars.nreverse();
             device = jars;
+            invalidateNamestring();
             return;
         }
@@ -336 +332 @@
             }
             String scheme = url.getProtocol();
+            if (scheme.equals("file")) {
+                Pathname p = new Pathname(s);
+                this.host = p.host;
+                this.device = p.device;
+                this.directory = p.directory;
+                this.name = p.name;
+                this.type = p.type;
+                this.version = p.version;
+                return;
+            }
             Debug.assertTrue(scheme != null);
             String authority = url.getAuthority();
@@ -345 +351 @@
             host = host.push(AUTHORITY);
             host = host.push(new SimpleString(authority));
-            host = host.nreverse();
 
             device = NIL;
@@ -365 +370 @@
             String query = uri.getRawQuery();
             if (query != null) {
-                path += "?" + query;
+                host = host.push(QUERY);
+                host = host.push(new SimpleString(query));
             }
             String fragment = uri.getRawFragment();
             if (fragment != null) {
-                path += "#" + fragment;
+                host = host.push(FRAGMENT);
+                host = host.push(new SimpleString(fragment));
             }
             Pathname p = new Pathname(path != null ? path : ""); 
@@ -377 +384 @@
             type = p.type;
             
+            host = host.nreverse();
+            invalidateNamestring();
             return;
         }
@@ -613 +622 @@
         } else if (device instanceof Cons) {
             LispObject[] jars = ((Cons) device).copyToArray();
-            int i = 0;
-            if (jars[0] instanceof AbstractString) {
-                sb.append("jar:");
-                sb.append(((AbstractString) jars[0]).getStringValue());
-                sb.append("!/");
-                i = 1;
-            }
             StringBuilder prefix = new StringBuilder();
-            for (; i < jars.length; i++) {
+            for (int i = 0; i < jars.length; i++) {
                 prefix.append("jar:");
-                if (i == 0) {
+                if (!((Pathname)jars[i]).isURL() && i == 0) {
                     sb.append("file:");
                 }
-                if (jars[i] instanceof Pathname) {
-                    sb.append(((Pathname) jars[i]).getNamestring());
-                }
+                sb.append(((Pathname) jars[i]).getNamestring());
                 sb.append("!/");
             }
@@ -679 +679 @@
             }
         }
+        
+        if (isURL()) {
+            LispObject o = Symbol.GETF.execute(host, QUERY, NIL);
+            if (o != NIL) {
+                sb.append("?");
+                sb.append(o.getStringValue());
+            }
+            o = Symbol.GETF.execute(host, FRAGMENT, NIL);
+            if (o != NIL) {
+                sb.append("#");
+                sb.append(o.getStringValue());
+            }
+        }
+            
         if (this instanceof LogicalPathname) {
             if (version.integerp()) {
@@ -695 +709 @@
         }
         namestring = sb.toString();
-        if (isURL()) {
+        if (isURL()) { 
             namestring = Utilities.uriEncode(namestring);
         }
@@ -1462 +1476 @@
                 SimpleString wildcardDirectory = new SimpleString(directory + "/");
 
-                ZipFile jar = ZipCache.get(pathname.device.car());
+                ZipFile jar = ZipCache.get((Pathname)pathname.device.car());
                 LispObject matches;
                 for (Enumeration<? extends ZipEntry> entries = jar.entries(); 
@@ -1560 +1574 @@
             final SimpleString wildcard = new SimpleString(wild);
 
-            ZipFile jar = ZipCache.get(pathname.device.car());
+            ZipFile jar = ZipCache.get((Pathname)pathname.device.car());
 
             for (Enumeration<? extends ZipEntry> entries = jar.entries(); entries.hasMoreElements();) {
@@ -1929 +1943 @@
             Cons jars = (Cons) pathname.device;
             LispObject o = jars.car();
-            if (o instanceof Pathname) {
+            if (o instanceof Pathname && ! (((Pathname)o).isURL())) {
                 LispObject truename = Pathname.truename((Pathname)o, errorIfDoesNotExist);
                 if (truename != null
@@ -1946 +1960 @@
             // 3.  JAR with Entry
             // 4.  JAR in JAR with Entry
-            ZipFile jarFile = ZipCache.get(jars.car());
+            ZipFile jarFile = ZipCache.get((Pathname)jars.car());
             String entryPath = pathname.asEntryPath();
             if (jarFile != null) {
@@ -2013 +2027 @@
     }
 
-    protected static URL makeURL(LispObject device) {
+    protected static URL makeURL(Pathname pathname) {
         URL result = null;
         try {
-        if (device instanceof SimpleString) {
-            result = new URL(((SimpleString)device).getStringValue());
-        } else {
-        // XXX ensure that we have cannonical path.
-            Pathname p = (Pathname)device;
-            result = new URL("file:" + p.getNamestring());
-        }
+            if (pathname.isURL()) {
+                result = new URL(pathname.getNamestring());
+            } else {
+                // XXX ensure that we have cannonical path.
+                result = new URL("file://" + pathname.getNamestring());
+            }
         } catch (MalformedURLException e) {
-            Debug.trace("Could not form URL from " + device);
+            Debug.trace("Could not form URL from " + pathname);
         }
         return result;
@@ -2035 +2048 @@
             // XXX We only return the bytes of an entry in a JAR
             Debug.assertTrue(entryPath != null);
-            ZipFile jarFile = ZipCache.get(device.car());
+            ZipFile jarFile = ZipCache.get((Pathname)device.car());
             Debug.assertTrue(jarFile != null);
             // Is this a JAR within a JAR?
@@ -2064 +2077 @@
                 result = url.openStream();
             } catch (IOException e) {
-                error(new FileError("Failed to get InputStream from "
-                                    + "'" + Utilities.escapeFormat(getNamestring()) + "'"
-                                    + ": " + e,
-                                    this));
+                Debug.trace("Failed to get InputStream from "
+                            + "'" + getNamestring() + "'"
+                            + ": " + e);
             }
         } else {
@@ -2074 +2086 @@
                 result = new FileInputStream(file);
             } catch (IOException e) {
-                error(new FileError("Failed to get InputStream from "
-                                    + "'" + getNamestring() + "'"
-                                    + ": " + e, this));
+                Debug.trace("Failed to get InputStream from "
+                            + "'" + getNamestring() + "'"
+                            + ": " + e);
             }
         }
@@ -2103 +2115 @@
                 if (entryPath.length() == 0) {
                     LispObject o = d.car();
-                    if (o instanceof SimpleString) {
                         // 0. JAR from URL
-                        // URL u = makeJarURL(o.getStringValue());
-                        // XXX unimplemented
-                        Debug.assertTrue(false);
-                        // URLConnection c = null;
-                        // try {
-                        //   c = u.openConnection();
-                        // } catch(IOException e) {
-                        //   Debug.trace("Failed to open Connection for URL "
-                        //               + "'" + u + "'");
-                        //   return 0;
-                        // }
-                        // c.getLastModified();
-                    } else  {  
                         // 1. JAR
-                        return ((Pathname)o).getLastModified();
-                    }
+                    return ((Pathname)o).getLastModified();
                 } else {
                     // 3. Entry in JAR
                     final ZipEntry entry 
-                        = ZipCache.get(device.car()).getEntry(entryPath);
+                        = ZipCache.get((Pathname)device.car()).getEntry(entryPath);
                     if (entry == null) {
                         return 0;
@@ -2135 +2132 @@
                 }
             } else {
-                ZipFile outerJar = ZipCache.get(d.car());
+                ZipFile outerJar = ZipCache.get((Pathname)d.car());
                 if (entryPath.length() == 0) {
                     // 4.  JAR in JAR
@@ -2210 +2207 @@
                 error(new FileError("Bad place for a wild pathname.", newName));
             }
+            if (original.isJar()) {
+                error(new FileError("Bad place for a jar pathname.", original));
+            }
+            if (newName.isJar()) {
+                error(new FileError("Bad place for a jar pathname.", newName));
+            }
+            if (original.isURL()) {
+                error(new FileError("Bad place for a URL pathname.", original));
+            }
+            if (newName.isURL()) {
+                error(new FileError("Bad place for a jar pathname.", newName));
+            }
+                
             newName = mergePathnames(newName, original, NIL);
             final String newNamestring;
@@ -2273 +2283 @@
         @Override
         public LispObject execute(LispObject arg) {
-            return coerceToPathname(arg).host;
+            return coerceToPathname(arg).host; // XXX URL-PATHNAME
         }
     }

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

@@ -152 +152 @@
 
   public static InputStream getEntryAsInputStream(ZipInputStream zipInputStream,
-                                                    String entryName)
+                                                  String entryName)
     {
         ZipEntry entry = getEntry(zipInputStream, entryName);
@@ -255 +255 @@
     }
 
-
     static String uriEncode(String s) {
         try {

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

@@ -98 +98 @@
     static HashMap<URL, Entry> zipCache = new HashMap<URL, Entry>();
 
-    synchronized public static ZipFile get(LispObject arg) {
-        return get(Pathname.makeURL(arg));
+    synchronized public static ZipFile get(Pathname p) {
+        return get(Pathname.makeURL(p));
     }