Changeset 2284

Timestamp:

06/11/03 01:01:29 (19 years ago)

Author:

piso

Message:

FUNCTION: support autoload.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.232 2003-06-10 01:12:14 piso Exp $
+ * $Id: Primitives.java,v 1.233 2003-06-11 01:01:29 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3337 +3337 @@
         new SpecialOperator("function") {
         public LispObject execute(LispObject args, Environment env)
-            throws LispError
+            throws Condition
         {
             LispObject arg = args.car();
             if (arg instanceof Symbol) {
                 LispObject functional = env.lookupFunctional(arg);
+                if (functional instanceof Autoload) {
+                    Autoload autoload = (Autoload) functional;
+                    Load._load(autoload.getFileName(), true, false);
+                    functional = autoload.getSymbol().getSymbolFunction();
+                }
                 if (functional instanceof Function)
                     return functional;