Changeset 13274

Timestamp:

05/04/11 19:13:32 (13 years ago)

Author:

ehuelsmann

Message:

Fix 147: *PRINT-CASE* setting affects COMPILE-FILE.

Found by Dan Corkill.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (1 diff)
• Load.java (modified) (1 diff)
• dump-form.lisp (modified) (1 diff)

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

@@ -1242 +1242 @@
   public static final LispObject readObjectFromString(String s)
   {
-    return new StringInputStream(s).read(true, NIL, false,
-                                         LispThread.currentThread(),
-                                         Stream.faslReadtable);
+    LispThread thread = LispThread.currentThread();
+    SpecialBindingsMark mark = thread.markSpecialBindings();
+    try {
+        thread.bindSpecial(Symbol.READ_BASE, LispInteger.getInstance(10));
+        thread.bindSpecial(Symbol.READ_EVAL, Symbol.T);
+        thread.bindSpecial(Symbol.READ_SUPPRESS, Nil.NIL);
+        // No need to bind read default float format: all floats are written
+        // with their correct exponent markers due to the fact that DUMP-FORM
+        // binds read-default-float-format to NIL
+
+        // No need to bind the default read table, because the default fasl
+        // read table is used below
+        return new StringInputStream(s).read(true, NIL, false,
+                                             LispThread.currentThread(),
+                                             Stream.faslReadtable);
+    }
+    finally {
+        thread.resetSpecialBindings(mark);
+    }
   }
 

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

@@ -601 +601 @@
             thread.bindSpecial(AUTOLOADING_CACHE,
                                AutoloadedFunctionProxy.makePreloadingContext());
+
+            // Same bindings are established in Lisp.readObjectFromString()
+            thread.bindSpecial(Symbol.READ_BASE, LispInteger.getInstance(10));
+            thread.bindSpecial(Symbol.READ_EVAL, Symbol.T);
+            thread.bindSpecial(Symbol.READ_SUPPRESS, Nil.NIL);
+
             in.setExternalFormat(_FASL_EXTERNAL_FORMAT_.symbolValue(thread));
             while (true) {

trunk/abcl/src/org/armedbear/lisp/dump-form.lisp

@@ -124 +124 @@
 (defun dump-form (form stream)
   (let ((*print-fasl* t)
+        (*print-array* t)
+        (*print-base* 10)
+        (*print-case* :upcase)
+        (*print-circle* nil)
+        (*print-escape* t)
+        (*print-gensym* t)
+        (*print-length* nil)
         (*print-level* nil)
-        (*print-length* nil)
-        (*print-circle* nil)
+        (*print-lines* nil)
+        (*print-pretty* nil)
+        (*print-radix* nil)
+        (*print-readably* t)
+        (*print-right-margin* nil)
         (*print-structure* t)
+
         ;; make sure to write all floats with their exponent marker:
         ;; the dump-time default may not be the same at load-time
-        (*read-default-float-format* nil))
+        (*read-default-float-format* nil)
+
+        ;; these values are also bound by WITH-STANDARD-IO-SYNTAX,
+        ;; but not used by our reader/printer, so don't bind them,
+        ;; for efficiency reasons.
+        ;;        (*read-eval* t)
+        ;;        (*read-suppress* nil)
+        ;;        (*print-miser-width* nil)
+        ;;        (*print-pprint-dispatch* (copy-pprint-dispatch nil))
+        ;;        (*read-base* 10)
+        ;;        (*read-default-float-format* 'single-float)
+        ;;        (*readtable* (copy-readtable nil))
+        )
     (dump-object form stream)))