Changeset 13446

Timestamp:

08/06/11 16:59:33 (12 years ago)

Author:

ehuelsmann

Message:

Fix #158: Print "#<abc>" fails with *PRINT-READABLY* non-NIL.

Note: This commit also fixes some failures in the random testing

ANSI tests, notably PRINT.RANDOM.SYMBOL.*.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• LispObject.java (modified) (1 diff)
• Primitives.java (modified) (1 diff)
• print.lisp (modified) (1 diff)

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

@@ -782 +782 @@
   public final String unreadableString(String s, boolean identity)
   {
+    if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
+        error(new PrintNotReadable(list(Keyword.OBJECT, this)));
+        return null; // not reached
+    }
     StringBuilder sb = new StringBuilder("#<");
     sb.append(s);

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

@@ -909 +909 @@
                 out = second;
             String output = first.printObject();
-            if (Symbol.PRINT_READABLY.symbolValue(LispThread.currentThread()) != NIL
-                && output.contains("#<")) {
-                //### Ticket #160: the cause lies here.
-                // You can't just go scan the content of the printed string,
-                // because the marker being sought may be part of the readable
-                // presentation
-                LispObject args = NIL;
-                args = args.push(first);
-                args = args.push(Keyword.OBJECT);
-                args = args.nreverse();
-                return error(new PrintNotReadable(args));
-            }
             checkStream(out)._writeString(output);
             return first;

trunk/abcl/src/org/armedbear/lisp/print.lisp

@@ -281 +281 @@
 
 (defun %print-object (object stream)
-  (when (and *print-readably* 
-             (typep object 'string)
-             (search "#<" object))
-    (error 'print-not-readable :object object))
   (if *print-pretty*
       (xp::output-pretty-object object stream)