Changeset 15449

Timestamp:

10/29/20 16:54:46 (3 years ago)

Author:

Mark Evenson

Message:

MAKE-PATHNAME normalizes types of device component

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (1 diff)

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

@@ -1195 +1195 @@
                 }
             } else {
-              p.setDevice(device);
+              if (device instanceof Cons) {
+                LispObject normalizedDevice = NIL;
+                if (device.car() instanceof SimpleString) {
+                  String rootNamestring = device.car().getStringValue();
+                  URLPathname root = new URLPathname();
+                  if (!isValidURL(rootNamestring)) {
+                    Pathname rootPathname = Pathname.create(rootNamestring);
+                    root = URLPathname.createFromFile(rootPathname);
+                  } else {
+                    root = URLPathname.create(rootNamestring);
+                  }
+                  normalizedDevice = normalizedDevice.push(root);
+                } else {
+                  normalizedDevice = normalizedDevice.push(device.car());
+                }
+                LispObject o = device.cdr();
+                while (!o.car().equals(NIL)) {
+                  Pathname next = coerceToPathname(o.car());
+                  normalizedDevice = normalizedDevice.push(next);
+                  o = o.cdr();
+                }
+                normalizedDevice = normalizedDevice.nreverse();
+                p.setDevice(normalizedDevice);
+              } else {
+                p.setDevice(device);
+              }
             }
         }