[armedbear-cvs] r14155 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Sat Sep 29 02:06:25 2012
New Revision: 14155

Log:
Better diagnostics for CL:MAKE-PATHNAME rules for allowable DEVICE components.

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

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	Wed Sep 19 11:58:21 2012	(r14154)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Sat Sep 29 02:06:25 2012	(r14155)
@@ -1324,6 +1324,11 @@
             } else if (key == Keyword.DEVICE) {
                 device = value;
                 deviceSupplied = true;
+                if (!(value instanceof AbstractString
+                      || 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));
             } else if (key == Keyword.DIRECTORY) {
                 directorySupplied = true;
                 if (value instanceof AbstractString) {