Changeset 11295

Timestamp:

08/31/08 10:00:03 (15 years ago)

Author:

ehuelsmann

Message:

Make PACKAGE-ERRORs printable.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• PackageError.java (modified) (1 diff)
• package.lisp (modified) (1 diff)

trunk/j/src/org/armedbear/lisp/PackageError.java

@@ -33 +33 @@
     {
         super.initialize(initArgs);
+
+        if (initArgs.listp() && initArgs.car().stringp()) {
+           setFormatControl(initArgs.car().getStringValue());
+           // When printing an error string, presumably, if the string contains
+           // a symbol, we'll want to complain about its full name, not the accessible
+           // name, because it may omit an (important) package name part.
+           // Two problems: (1) symbols can be contained in sublists
+           //               (2) symbols may not be printed, but used otherwise.
+           for (LispObject arg = initArgs.cdr(); arg != NIL; arg = arg.cdr()) {
+              if (arg.car() instanceof Symbol)
+                 arg.setCar(new SimpleString(((Symbol)arg.car()).getQualifiedName()));
+           }
+           setFormatArguments(initArgs.cdr());
+           setPackage(NIL);
+
+           return;
+        }
+
         LispObject pkg = NIL;
         LispObject first, second;

trunk/j/src/org/armedbear/lisp/package.lisp

@@ -42 +42 @@
           (progn
             (when (and local-sym (not (eql symbol local-sym)))
-              (error 'package-error (format nil "Symbol ~S already accessible in package ~S." local-sym (package-name package))))
+              (error 'package-error
+                     "Different symbol (~A) with the same name already accessible in package ~A."
+                     local-sym (package-name package)))
             (if package-supplied-p
                 (%import symbol package)