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

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sun Jul 29 13:04:53 2012
New Revision: 14023

Log:
Remove Function Preloading facility not in use for quite some time.

Deleted:
   trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java
Modified:
   trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java
   trunk/abcl/src/org/armedbear/lisp/Load.java
   trunk/abcl/src/org/armedbear/lisp/Primitives.java

Modified: trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java	Sun Jul 29 12:14:08 2012	(r14022)
+++ trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java	Sun Jul 29 13:04:53 2012	(r14023)
@@ -224,10 +224,6 @@
         namestring = ((Pathname)arg).getNamestring();
       else if (arg instanceof AbstractString)
         namestring = arg.getStringValue();
-      if (namestring != null) {
-          //    Debug.trace("autoloading preloaded ... " + namestring);
-        return AutoloadedFunctionProxy.loadPreloadedFunction(namestring);
-      }
       if(arg instanceof JavaObject) {
 	  try {
 	      return loadClassBytes((byte[]) arg.javaInstance(byte[].class));

Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	Sun Jul 29 12:14:08 2012	(r14022)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Sun Jul 29 13:04:53 2012	(r14023)
@@ -600,9 +600,6 @@
         final SpecialBindingsMark mark = thread.markSpecialBindings();
         LispObject result = NIL;
         try {
-            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);

Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java	Sun Jul 29 12:14:08 2012	(r14022)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java	Sun Jul 29 13:04:53 2012	(r14023)
@@ -1736,8 +1736,7 @@
             if (arg instanceof Symbol) {
                 LispObject oldDefinition = arg.getSymbolFunction();
                 if (oldDefinition != null
-                        && !(oldDefinition instanceof Autoload)
-                        && !(oldDefinition instanceof AutoloadedFunctionProxy)) {
+                        && !(oldDefinition instanceof Autoload)) {
                     LispObject oldSource =
                         Extensions.SOURCE_PATHNAME.execute(arg);
                     LispObject currentSource = _SOURCE_.symbolValue(thread);