Changeset 3810

Timestamp:

09/16/03 13:30:09 (20 years ago)

Author:

piso

Message:

Moved RESOLVE from Primitives.java to Autoload.java.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (3 diffs)
• Primitives.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.63 2003-09-15 15:48:48 piso Exp $
+ * $Id: Autoload.java,v 1.64 2003-09-16 13:30:09 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -116 +116 @@
 
     private static final Primitive AUTOLOAD =
-        new Primitive("autoload", PACKAGE_SYS, true) {
+        new Primitive("autoload", PACKAGE_SYS, true)
+    {
         public LispObject execute(LispObject first) throws LispError
         {
@@ -150 +151 @@
             }
             throw new TypeError(first);
+        }
+    };
+
+    // ### resolve
+    // Force autoload to be resolved.
+    private static final Primitive1 RESOLVE =
+        new Primitive1("resolve", PACKAGE_SYS, false)
+    {
+        public LispObject execute(LispObject arg) throws Condition
+        {
+            Symbol symbol = checkSymbol(arg);
+            LispObject fun = symbol.getSymbolFunction();
+            if (fun instanceof Autoload) {
+                Autoload autoload = (Autoload) fun;
+                autoload.load();
+                return autoload.getSymbol().getSymbolFunction();
+            }
+            return fun;
         }
     };

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.397 2003-09-15 15:02:06 piso Exp $
+ * $Id: Primitives.java,v 1.398 2003-09-16 13:29:57 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3370 +3370 @@
     };
 
-    // ### resolve
-    // Force autoload to be resolved.
-    private static final Primitive1 RESOLVE =
-        new Primitive1("resolve", PACKAGE_SYS, false) {
-        public LispObject execute(LispObject arg) throws Condition
-        {
-            Symbol symbol = checkSymbol(arg);
-            LispObject fun = symbol.getSymbolFunction();
-            if (fun instanceof Autoload) {
-                Autoload autoload = (Autoload) fun;
-                autoload.load();
-                return autoload.getSymbol().getSymbolFunction();
-            }
-            return fun;
-        }
-    };
-
     // ### setq
     private static final SpecialOperator SETQ = new SpecialOperator("setq") {