[armedbear-cvs] r12717 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat May 22 16:51:09 2010
New Revision: 12717

Log:
Remove convenience method which "prevents" typing of 1 boolean value.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Interpreter.java
   trunk/abcl/src/org/armedbear/lisp/Load.java

Modified: trunk/abcl/src/org/armedbear/lisp/Interpreter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Interpreter.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Interpreter.java	Sat May 22 16:51:09 2010
@@ -177,7 +177,7 @@
             }
             catch (ClassNotFoundException e) { } // FIXME: what to do?
 
-            Load.loadSystemFile("j.lisp");
+            Load.loadSystemFile("j.lisp", false); // not being autoloaded
 
             initialized = true;
         }
@@ -217,7 +217,7 @@
 
     private static synchronized void initializeSystem() 
     {
-        Load.loadSystemFile("system");
+        Load.loadSystemFile("system", false); // not being autoloaded
     }
 
     // Check for --noinit; verify that arguments are supplied for --load and
@@ -308,7 +308,7 @@
                                       false, false, true);
 
                         else
-                            Load.loadSystemFile(args[i + 1]);
+                            Load.loadSystemFile(args[i + 1], false); // not being autoloaded
                         ++i;
                     } else {
                         // Shouldn't happen.

Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Sat May 22 16:51:09 2010
@@ -216,16 +216,6 @@
         }
     }
 
-    public static final LispObject loadSystemFile(String filename)
-
-    {
-        final LispThread thread = LispThread.currentThread();
-        return loadSystemFile(filename,
-                              Symbol.LOAD_VERBOSE.symbolValue(thread) != NIL,
-                              Symbol.LOAD_PRINT.symbolValue(thread) != NIL,
-                              false);
-    }
-
     public static final LispObject loadSystemFile(String filename, boolean auto)
 
     {