Changeset 14359

Timestamp:

01/17/13 11:15:14 (11 years ago)

Author:

Mark Evenson

Message:

Refactor autoload functions to naming conventions.

File:

• trunk/abcl/src/org/armedbear/lisp/Autoload.java (modified) (4 diffs)

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

@@ -99 +99 @@
     }
 
-
     private static void effectiveLoad(String className, String fileName) {
         if (className != null) {
@@ -277 +276 @@
     }
 
-    // ### autoload
-    private static final Primitive AUTOLOAD =
-        new Primitive("autoload", PACKAGE_EXT, true)
-    {
+    public static final Primitive AUTOLOAD = new pf_autoload();
+    @DocString(name="autoload",
+               args="symbol-or-symbols filename",
+               doc="Setup the autoload for SYMBOL-OR-SYMBOLS optionally corresponding to FILENAME.")
+    private static final class pf_autoload extends Primitive {
+        pf_autoload() {    
+            super("autoload", PACKAGE_EXT, true);
+        }
         @Override
         public LispObject execute(LispObject first)
@@ -319 +322 @@
     };
 
-    // ### resolve
-    // Force autoload to be resolved.
-    private static final Primitive RESOLVE =
-        new Primitive("resolve", PACKAGE_EXT, true, "symbol")
-    {
+    public static final Primitive RESOLVE = new pf_resolve();
+    @DocString(name="resolve", 
+               args="symbol",
+               doc="Force the symbol to be resolved via the autoloader mechanism.")
+    private static final class pf_resolve extends Primitive {
+        pf_resolve() {
+            super("resolve", PACKAGE_EXT, true, "symbol");
+        }
         @Override
-        public LispObject execute(LispObject arg)
-        {
+        public LispObject execute(LispObject arg) {
             Symbol symbol = checkSymbol(arg);
             LispObject fun = symbol.getSymbolFunction();
@@ -336 +341 @@
             return fun;
         }
-    };
-
-    // ### autoloadp
-    private static final Primitive AUTOLOADP =
-        new Primitive("autoloadp", PACKAGE_EXT, true, "symbol")
-    {
+    }
+
+    public static final Primitive AUTOLOADP = new pf_autoloadp();
+    @DocString(name="autoloadp", 
+               args="symbol",
+               doc="Boolean predicate for whether SYMBOL stands for a function that currently needs to be autoloaded.")
+    private static final class pf_autoloadp extends Primitive {
+        pf_autoloadp() {
+            super("autoloadp", PACKAGE_EXT, true, "symbol");
+        }
+                   
         @Override
         public LispObject execute(LispObject arg)