Changeset 15413

Timestamp:

10/14/20 07:07:23 (3 years ago)

Author:

Mark Evenson

Message:

pathname: actually perform deep copy of host

Fix MAKE-PATHNAME creation of JAR-PATHNAME with remote URL.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/JarPathname.java (modified) (1 diff)
• src/org/armedbear/lisp/Pathname.java (modified) (3 diffs)
• src/org/armedbear/lisp/URLPathname.java (modified) (1 diff)
• test/src/org/armedbear/lisp/JarPathnameTest.java (modified) (2 diffs)

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

@@ -551 +551 @@
     return result;
   }
-
-  static LispObject makeDeviceFrom(JarPathname p) {
-    JarPathname result = new JarPathname();
-    result.copyFrom(p);
-    Pathname rootJar = (Pathname)result.getRootJar();
-    if (!rootJar.equals(NIL)
-        && (rootJar instanceof Pathname)) {
-      rootJar = (Pathname)URLPathname.createFromFile(rootJar);
-      result.setDevice(new Cons(rootJar, result.getJars().cdr()));
-    }
-    return result;
-  }
-
-  static LispObject makeJarDeviceFrom(Pathname p) {
-    JarPathname result = new JarPathname();
-    result.copyFrom(p);
-    Pathname rootJar = (Pathname)result.getRootJar();
-    // Ensure
-    if (!rootJar.equals(NIL)
-        && (rootJar instanceof Pathname)) {
-      rootJar = (Pathname)URLPathname.createFromFile(rootJar);
-      result.setDevice(new Cons(rootJar, result.getJars().cdr()));
-    }
-    return result.getDevice();
-  }
 }

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

@@ -172 +172 @@
   Pathname copyFrom(Pathname p) {
         if (p.host != NIL) {
-            if (p.host instanceof SimpleString) {
-              setHost(new SimpleString(((SimpleString)p.getHost()).getStringValue()));
-            } else  if (p.host instanceof Symbol) {
-              setHost(p.host);
-            } else if (p.host instanceof Cons) {
-                host = new Cons((Cons)p.getHost());
+          LispObject pHost = p.getHost();
+          if (pHost instanceof SimpleString) {
+              setHost(new SimpleString(pHost.getStringValue()));
+            } else if (pHost instanceof Symbol) {
+              setHost(pHost);
+          } else if (pHost instanceof Cons) {
+              LispObject newHost = NIL;
+              LispObject components = pHost.reverse();
+              while (!components.car().equals(NIL)) {
+                LispObject copy = components.car(); // TODO actually make a copy?
+                newHost = newHost.push(copy);
+                components = components.cdr();
+              }
+              setHost(newHost);
             } else {
               simple_error("Failed to copy host in pathname ~a", p);
@@ -188 +196 @@
               LispObject jars = p.getDevice();
               setDevice(NIL);
-              URLPathname root = URLPathname.create((Pathname)jars.car());
+              URLPathname root = null;
+              Pathname rootPathname = (Pathname) jars.car();
+              if (rootPathname instanceof URLPathname) {
+                root = URLPathname.create((URLPathname)rootPathname); 
+              } else {
+                root = URLPathname.create((Pathname)rootPathname);
+              }
               device = device.push(root);
               jars = jars.cdr();
@@ -1237 +1251 @@
         if (p.getDevice() instanceof Cons) {
           JarPathname result = new JarPathname();
-          result
-            .copyFrom(p)
-            .setDevice(JarPathname.makeJarDeviceFrom(p));
-          
+          result.copyFrom(p);
+          Pathname root = (Pathname)result.getDevice().car();
+          URLPathname rootDevice = null;
+          if (root instanceof URLPathname) {
+            rootDevice = URLPathname.create((URLPathname)root);
+          } else {
+            rootDevice = URLPathname.create(root);
+          }
+          result.setDevice(new Cons(rootDevice, result.getDevice().cdr()));
           // sanity check that the pathname has been constructed correctly
+
           result.validateComponents();
-
           return result;
         }
-        
         return p;
     }
+
 
     private static final AbstractString validateStringComponent(AbstractString s) {

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

@@ -163 +163 @@
       host = host.push(FRAGMENT).push(new SimpleString(fragment));
     }
-    result.setHost(host.nreverse());
+    host = host.nreverse();
+    result.setHost(host);
 
     // URI encode necessary characters

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

@@ -78 +78 @@
       "jar:jar:file:///foo.jar!/baz.abcl!/",
       "jar:jar:file:///foo.jar!/baz.abcl!/__loader__._",
-      "jar:jar:jar:file:///a/b/foo.jar!/c/baz.zip!/log4j.jar!/MF/manifest.mf"
+      "jar:jar:jar:file:///a/b/foo.jar!/c/baz.zip!/log4j.jar!/MF/manifest.mf",
+      "jar:https://abcl.org/releases/1.7.1/abcl-contrib.jar!/"
     };
 
@@ -114 +115 @@
     }
   }
+
+  @Test
+  public void makePathname() {
+    String urlString = "https://abcl.org/releases/1.7.1/abcl-contrib.jar";
+    URLPathname urlPathname = URLPathname.create(urlString);
+    LispObject args[] = {Keyword.DEVICE, Lisp.list(urlPathname)};
+    LispObject result = Symbol.MAKE_PATHNAME.execute(args);
+    assertTrue("MAKE-PATHNAME created instance of a JAR-PATHNAME", result instanceof JarPathname);
+    String expectedNamestring
+      = MessageFormat.format("jar:{0}!/", urlString);
+    String resultingNamestring
+      = ((JarPathname)result).getNamestring();
+    assertTrue(MessageFormat.format("Namestring '{0}' is '{1}'", expectedNamestring, resultingNamestring),
+               expectedNamestring.equals(resultingNamestring));
+  }
+                                         
 }