Changeset 15457

Timestamp:

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

Author:

Mark Evenson

Message:

Allows SLIME to load under Windows

Be rigourous about when allowing an :UNSPECIFIC value in a DEVICE as
it only makes sense in non-Windows environments.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• JarPathname.java (modified) (1 diff)
• Load.java (modified) (1 diff)
• Pathname.java (modified) (7 diffs)

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

@@ -384 +384 @@
       rootJar.copyFrom((Pathname)p.getRootJar());
 
-      // Ensure that we don't return a JarPathname if the current default is one
-      if (rootJar.getDevice().equals(NIL)) {
+      // Ensure that we don't return a JarPathname if the current
+      // default is one when we resolve its TRUENAME.  Under Windows,
+      // the device will get filled in with the DOS drive letter if
+      // applicable.
+      if (rootJar.getDevice().equals(NIL)
+          && !Utilities.isPlatformWindows) {
         rootJar.setDevice(Keyword.UNSPECIFIC);
       }

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

@@ -289 +289 @@
         if (bootPath instanceof Pathname) {
           mergedPathname = (Pathname)Symbol.MERGE_PATHNAMES.execute(pathname, bootPath);
-          // So PROBE-FILE won't attempt to merge when
+          // So a PROBE-FILE won't attempt to merge when
           // *DEFAULT-PATHNAME-DEFAULTS* is a JAR
-          if (mergedPathname.getDevice().equals(NIL)) {
+          if (mergedPathname.getDevice().equals(NIL)
+              && !Utilities.isPlatformWindows) {
             mergedPathname.setDevice(Keyword.UNSPECIFIC);
           }

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

@@ -540 +540 @@
         }
 
-        if (getDevice() == NIL) {
-        } else if (getDevice() == Keyword.UNSPECIFIC) {
+        if (getDevice().equals(NIL)
+            || getDevice().equals(Keyword.UNSPECIFIC)) {
+          // nothing emitted for device
         } else if (getDevice() instanceof AbstractString) {
             sb.append(getDevice().getStringValue());
@@ -1112 +1113 @@
                       || value.equals(Keyword.UNSPECIFIC)
                       || value.equals(NIL)
-                      || value instanceof Cons))
-                  error(new TypeError("DEVICE is not a string, :UNSPECIFIC, NIL, or a list.", value, NIL));
+                      || value instanceof Cons)) {
+                  return type_error("DEVICE is not a string, :UNSPECIFIC, NIL, or a list.",
+                                    value,
+                                    list(Symbol.OR,
+                                         Symbol.STRING, Keyword.UNSPECIFIC, NIL, Symbol.CONS));
+                }
             } else if (key == Keyword.DIRECTORY) {
                 directorySupplied = true;
@@ -1121 +1126 @@
                     directory = list(Keyword.ABSOLUTE, Keyword.WILD);
                 } else {
-                  // a valid pathname directory is a string, a list of strings, nil, :wild, :unspecific
+                  // a valid pathname directory is a string, a list of
+                  // strings, nil, :wild, :unspecific
+                  //
                   // ??? would be nice to (deftype pathname-arg ()
-                  // '(or (member :wild :unspecific) string (and cons ,(mapcar ...
-                  // Is this possible?
+                  // '(or (member :wild :unspecific) string (and cons
+                  // ,(mapcar ...  Is this possible?
                   if ((value instanceof Cons 
                        // XXX check that the elements of a list are themselves valid
@@ -1131 +1138 @@
                       directory = value;
                   } else {
-                      error(new TypeError("DIRECTORY argument not a string, list of strings, nil, :WILD, or :UNSPECIFIC.", value, NIL));
+                    return
+                      type_error("DIRECTORY argument not a string, list of strings, nil, :WILD, or :UNSPECIFIC.",
+                                 value,
+                                 list(Symbol.OR,
+                                      NIL, Symbol.STRING, Symbol.CONS, Keyword.WILD, Keyword.UNSPECIFIC));
                   }
                 }
@@ -1169 +1180 @@
             }
         }
-        Pathname p;
+        Pathname p; // Pathname is always created in following
+                    // resolution for values of HOST
         LispObject logicalHost = NIL;
         if (host != NIL) {
@@ -1184 +1196 @@
                 p.setHost(logicalHost);
             }
-            p.setDevice(Keyword.UNSPECIFIC);
+            if (!Utilities.isPlatformWindows) {
+              p.setDevice(Keyword.UNSPECIFIC);
+            }
         } else {
             p = Pathname.create();
         }
+        
         if (device != NIL) {
             if (p instanceof LogicalPathname) {
                 // "The device component of a logical pathname is always :UNSPECIFIC."
                 if (device != Keyword.UNSPECIFIC) {
-                    error(new LispError("The device component of a logical pathname must be :UNSPECIFIC."));
+                  return type_error("The device component of a logical pathname must be :UNSPECIFIC.",
+                                    p.getDevice(), Keyword.UNSPECIFIC);
                 }
             } else {
@@ -1294 +1310 @@
         return p;
     }
+