Changeset 15394

Timestamp:

10/10/20 21:43:26 (3 years ago)

Author:

Mark Evenson

Message:

Starting to hook jar/uri mechanisms up

Failing to roundtrip

(pathname "jar:jar:file:foo.jar!/baz.abcl!/")

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Lisp.java (modified) (1 diff)
• src/org/armedbear/lisp/Pathname.java (modified) (5 diffs)
• test/src/org/armedbear/lisp/PathnameJarTest.java (modified) (2 diffs)

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

@@ -1914 +1914 @@
       return (Pathname) arg;
     if (arg instanceof AbstractString)
-      return Pathname.parseNamestring((AbstractString)arg);
+      return (Pathname)Pathname.parseNamestring((AbstractString)arg);
     if (arg instanceof FileStream)
       return ((FileStream)arg).getPathname();

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

@@ -50 +50 @@
 public class Pathname extends LispObject implements Serializable {
 
-  protected static Pathname create(Pathname p) {
-    return new Pathname(p);
-  }
-
   protected static Pathname create() {
     return new Pathname();
   }
 
+  protected static Pathname create(Pathname p) {
+    if (p instanceof PathnameJar) {
+      return (PathnameJar)PathnameJar.create(p.getNamestring());
+    } else if (p instanceof PathnameURL) {
+      return (PathnameURL)PathnameURL.create(((PathnameURL)p).getNamestringAsURI());
+    } else {
+      return new Pathname(p);
+    }
+  }
+
   public static LispObject create(String s) {
     // TODO distinguish between logical hosts and schemes for URLs
     // which we can meaningfully parse.
-    if (!isValidURL(s)) {
+
+    if (s.startsWith(PathnameJar.JAR_URI_PREFIX)) {
+        return PathnameJar.create(s);
+    }
+    if (isValidURL(s)) {
+      return PathnameURL.create(s);
+    } else {
       if (LogicalPathname.isValidLogicalPathname(s)) {
         return LogicalPathname.create(s);
       }
     }
-    return new Pathname(s);
+    Pathname result = new Pathname();
+    result.init(s);
+    return result;
   }
 
@@ -673 +687 @@
     @Override
     public LispObject typeOf() {
-        if (isURL()) {
-            return Symbol.URL_PATHNAME;
-        } 
-        if (isJar()) {
-            return Symbol.JAR_PATHNAME;
-        }
-        return Symbol.PATHNAME;
+      if (isJar()) {
+        return Symbol.JAR_PATHNAME;
+      }
+      if (isURL()) {
+        return Symbol.URL_PATHNAME;
+      } 
+      return Symbol.PATHNAME;
     }
 
     @Override
     public LispObject classOf() {
-        if (isURL()) {
-            return BuiltInClass.URL_PATHNAME;
-        } 
-        if (isJar()) {
-            return BuiltInClass.JAR_PATHNAME;
-        }
-        return BuiltInClass.PATHNAME;
+      if (isJar()) {
+        return BuiltInClass.JAR_PATHNAME;
+      }
+      if (isURL()) {
+        return BuiltInClass.URL_PATHNAME;
+      } 
+      return BuiltInClass.PATHNAME;
     }
 
@@ -1122 +1136 @@
         return true;
     }
-
-//    public static URL toURL(Pathname p) {
- //       try {
-//            return p.toURL();
-//        } catch (MalformedURLException e) {
-//            Debug.assertTrue(false);
-//            return null; // not reached
-//        }
-//    }
 
     URLConnection getURLConnection() {
@@ -2418 +2423 @@
                 result = new URL(pathname.getNamestring());
             } else {
-                // XXX Properly encode Windows drive letters and UNC paths
-                // XXX ensure that we have cannonical path?
-                result = new URL("file://" + pathname.getNamestring());
+              // XXX Properly encode Windows drive letters and UNC paths
+              // XXX ensure that we have cannonical path?
+              String ns = pathname.getNamestring();
+              if (ns.startsWith("/"))  {
+                result = new URL("file://" + ns);
+              } else { // "relative" path
+                result = new URL("file:" + ns);
+              }
             }
         } catch (MalformedURLException e) {
@@ -2832 +2842 @@
         }
     }
-
-  // BEGIN REMOVE ME use standard Factory pattern create() method instead
-  public static Pathname make(String s) {
-    Pathname p = Pathname.create();
-    p.init(s);
-    return p;
-  }
-
-  public static Pathname makeFrom(Pathname p) {
-    return Pathname.create(p);
-  }
-
-  public static Pathname makeFrom(Pathname p, String s) {
-    p.init(s);
-    return p;
-  }
-  // END REMOVE ME
 }
-

trunk/abcl/test/src/org/armedbear/lisp/PathnameJarTest.java

@@ -2 +2 @@
 
 import java.util.List;
+import java.text.MessageFormat;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -67 +68 @@
   }
 
+  @Test
+  public void roundTrips() {
+    String namestrings[] = {
+      "jar:file:foo.jar!/",
+      "jar:jar:file:foo.jar!/baz.abcl!/",
+      "jar:jar:file:foo.jar!/baz.abcl!/__loader__._"
+    };
+
+    for (String namestring  : namestrings) {
+      Pathname result = (Pathname) Pathname.create(namestring);
+      String resultingNamestring = result.getNamestring();
+      String message = MessageFormat.format("Namestring \"{0}\" failed to roundtrip", namestring);
+      assertTrue(message,
+                 namestring.equals(resultingNamestring));
+    }
+  }
+
+  @Test
+  public void invalidNamestrings() {
+    String namestrings[] = {
+      "jar:file:foo.jar!/baz.abcl!/",
+      "jar:file:foo.jar!/baz.abcl!/__loader__._"
+    };
+
+    // JUnit 4.12 (which is what is available in Netbeans 12) doesn't
+    // have an assertion about throwing an error.
+    for (String namestring  : namestrings) {
+      try { 
+        Pathname.create(namestring);
+      } catch (Throwable t) {
+        String message = MessageFormat.format("Namestring \"{0}\" is invalid throwing: {1}",
+                                              namestring,
+                                              t.getCause());
+        assertTrue(message, true);
+      }
+    }
+  }
 }