Changeset 15120

Timestamp:

04/23/18 17:58:49 (4 years ago)

Author:

Mark Evenson

Message:

Don't evaluate format control string in ReaderError?
(Javier Olaechea)

To do so we extend the ReaderError? with a new constructor that takes two
extra arguments.

Merges <​https://github.com/armedbear/abcl/pull/86>.

Addresses <​https://github.com/armedbear/abcl/issues/85>.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• ReaderError.java (modified) (1 diff)
• Stream.java (modified) (1 diff)

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

@@ -53 +53 @@
     }
 
+  public ReaderError(String message, Stream stream, LispObject arg1, LispObject arg2)
+  {
+        super(StandardClass.READER_ERROR);
+        setFormatControl(message);
+        setFormatArguments(list(arg1, arg2));
+        setStream(stream);
+  }
+
     public ReaderError(LispObject initArgs)
     {

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

@@ -1191 +1191 @@
 
                 // Error!
-                if (pkg.findInternalSymbol(symbolName) != null)
-                    return error(new ReaderError("The symbol \"" + symbolName +
-                                                 "\" is not external in package " +
-                                                 packageName + '.',
-                                                 this));
-                else
-                    return error(new ReaderError("The symbol \"" + symbolName +
-                                                 "\" was not found in package " +
-                                                 packageName + '.',
-                                                 this));
+                if (pkg.findInternalSymbol(symbolName) != null) {
+                    return error(new ReaderError("The symbol \"~A\" is not external in package ~A.",
+                                                 this,
+                                                 new SimpleString(symbolName),
+                                                 new SimpleString(packageName)));
+                } else {
+                    return error(new ReaderError("The symbol \"~A\" was not found in package ~A.",
+                                                 this,
+                                                 new SimpleString(symbolName),
+                                                 new SimpleString(packageName)));
+                }
             }
         } else {                // token.length == 0