Changeset 12723

Timestamp:

05/23/10 09:31:32 (14 years ago)

Author:

ehuelsmann

Message:

Style nit: I like tables and loops for their compactness.

File:

• trunk/abcl/src/org/armedbear/lisp/Load.java (modified) (2 diffs)

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

@@ -431 +431 @@
     }
 
+    private static Symbol[] savedSpecials =
+        new Symbol[] { // CLHS Specified
+                       Symbol.CURRENT_READTABLE, Symbol._PACKAGE_,
+                       // Compiler policy
+                       _SPEED_, _SPACE_, _SAFETY_, _DEBUG_, _EXPLAIN_ };
+
     // A nil TRUENAME signals a load from stream which has no possible path
     private static final LispObject loadFileFromStream(LispObject pathname,
@@ -444 +450 @@
         final LispThread thread = LispThread.currentThread();
         final SpecialBindingsMark mark = thread.markSpecialBindings();
-        // "LOAD binds *READTABLE* and *PACKAGE* to the values they held before
-        // loading the file."
-        thread.bindSpecialToCurrentValue(Symbol.CURRENT_READTABLE);
-        thread.bindSpecialToCurrentValue(Symbol._PACKAGE_);
+
+        for (Symbol special : savedSpecials)
+            thread.bindSpecialToCurrentValue(special);
+
         int loadDepth = Fixnum.getValue(_LOAD_DEPTH_.symbolValue(thread));
         thread.bindSpecial(_LOAD_DEPTH_, Fixnum.getInstance(++loadDepth));
-        // Compiler policy.
-        thread.bindSpecialToCurrentValue(_SPEED_);
-        thread.bindSpecialToCurrentValue(_SPACE_);
-        thread.bindSpecialToCurrentValue(_SAFETY_);
-        thread.bindSpecialToCurrentValue(_DEBUG_);
-        thread.bindSpecialToCurrentValue(_EXPLAIN_);
         final String prefix = getLoadVerbosePrefix(loadDepth);
         try {