Changeset 15032

Timestamp:

06/01/17 06:46:20 (6 years ago)

Author:

Mark Evenson

Message:

Better directory validation; handle :UNSPECIFIC

(Olof-Joachim Frahm)

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Pathname.java (modified) (5 diffs)
• test/lisp/abcl/pathname-tests.lisp (modified) (1 diff)

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

@@ -791 +791 @@
         // is, both NIL and :UNSPECIFIC cause the component not to appear in
         // the namestring." 19.2.2.2.3.1
-        if (directory != NIL) {
+        if (directory != NIL && directory != Keyword.UNSPECIFIC) {
             final char separatorChar = '/';
             LispObject temp = directory;
@@ -820 +820 @@
                 } else if (part == Keyword.UP) {
                     sb.append("..");
-                } else {
-                    error(new FileError("Unsupported directory component " + part.princToString() + ".",
-                      this));
                 }
                 sb.append(separatorChar);
@@ -1481 +1478 @@
         
         p.version = version;
+        p.validateDirectory(true);
         return p;
     }
@@ -1502 +1500 @@
     private final boolean validateDirectory(boolean signalError) {
         LispObject temp = directory;
+        if (temp == Keyword.UNSPECIFIC) {
+            return true;
+        }
         while (temp != NIL) {
             LispObject first = temp.car();
@@ -1518 +1519 @@
                     return false;
                 }
+            } else if (first != Keyword.RELATIVE
+                       && first != Keyword.WILD
+                       && first != Keyword.UP
+                       && first != Keyword.BACK
+                       && !(first instanceof AbstractString)) {
+                if (signalError) {
+                    error(new FileError("Unsupported directory component " + first.princToString() + ".",
+                      this));
+                }
+                return false;
             }
         }

trunk/abcl/test/lisp/abcl/pathname-tests.lisp

@@ -1723 +1723 @@
   :wild :wild :wild (:absolute :wild))
       
+
+(deftest pathname.make-pathname.3
+    (signals-error
+     (make-pathname :directory '(:absolute ("a" "b")))
+     'file-error)
+  t)
+
+(deftest pathname.make-pathname.4
+    (directory-namestring (make-pathname :directory :unspecific))
+  "")