Changeset 13017

Timestamp:

11/10/10 22:23:05 (12 years ago)

Author:

Mark Evenson

Message:

Check type in MAKE-PATHNAME for :DIRECTORY components.

File:

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

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

@@ -1245 +1245 @@
                     directory = list(Keyword.ABSOLUTE, Keyword.WILD);
                 } else {
-                    directory = value;
+                  // 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?
+                  if ((value instanceof Cons 
+                       // XXX check that the elements of a list are themselves valid
+                       || value == Keyword.UNSPECIFIC
+                       || value.equals(NIL))) {
+                      directory = value;
+                  } else {
+                      error(new TypeError("DIRECTORY argument not a string, list of strings, nil, :WILD, or :UNSPECIFIC.", value, NIL));
+                  }
                 }
             } else if (key == Keyword.NAME) {