Changeset 11889


Ignore:
Timestamp:
05/17/09 11:36:40 (9 years ago)
Author:
vvoutilainen
Message:

Remove CompiledFunction?, we don't need it.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java

    r11888 r11889  
    205205    return notImplemented();
    206206  }
     207
     208  // ### load-compiled-function
     209  private static final Primitive LOAD_COMPILED_FUNCTION =
     210      new Primitive("load-compiled-function", PACKAGE_SYS, true, "pathname")
     211  {
     212    @Override
     213    public LispObject execute(LispObject arg) throws ConditionThrowable
     214    {
     215      String namestring = null;
     216      if (arg instanceof Pathname)
     217        namestring = ((Pathname)arg).getNamestring();
     218      else if (arg instanceof AbstractString)
     219        namestring = arg.getStringValue();
     220      if (namestring != null)
     221        return loadCompiledFunction(namestring);
     222      return error(new LispError("Unable to load " + arg.writeToString()));
     223    }
     224  };
     225
     226  // ### varlist
     227  private static final Primitive VARLIST =
     228      new Primitive("varlist", PACKAGE_SYS, false)
     229  {
     230    @Override
     231    public LispObject execute(LispObject arg) throws ConditionThrowable
     232    {
     233      if (arg instanceof Closure)
     234        return ((Closure)arg).getVariableList();
     235      return type_error(arg, Symbol.COMPILED_FUNCTION);
     236    }
     237  };
    207238}
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r11883 r11889  
    25192519    loadClass("org.armedbear.lisp.SpecialOperators");
    25202520    loadClass("org.armedbear.lisp.Extensions");
    2521     loadClass("org.armedbear.lisp.CompiledFunction");
     2521    loadClass("org.armedbear.lisp.CompiledClosure");
    25222522    loadClass("org.armedbear.lisp.Autoload");
    25232523    loadClass("org.armedbear.lisp.AutoloadMacro");
  • trunk/abcl/src/org/armedbear/lisp/Load.java

    r11884 r11889  
    353353    // internal symbol
    354354    private static final Symbol _FASL_VERSION_ =
    355         exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(31));
     355        exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(32));
    356356
    357357    // ### *fasl-anonymous-package*
  • trunk/abcl/src/org/armedbear/lisp/Primitives.java

    r11883 r11889  
    24402440            value3 = name != null ? name : NIL;
    24412441          }
    2442         else if (arg instanceof Closure && !(arg instanceof CompiledFunction))
     2442        else if (arg instanceof Closure)
    24432443          {
    24442444            Closure closure = (Closure) arg;
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r11886 r11889  
    242242(defconstant +lisp-go-class+ "org/armedbear/lisp/Go")
    243243(defconstant +lisp-compiled-closure-class+ "org/armedbear/lisp/CompiledClosure")
    244 (defconstant +lisp-compiled-function-class+ "org/armedbear/lisp/CompiledFunction")
    245244(defconstant +lisp-primitive-class+ "org/armedbear/lisp/Primitive")
    246245(defconstant +lisp-hash-table-class+ "org/armedbear/lisp/HashTable")
     
    18111810    (setf (method-max-locals constructor) 1)
    18121811    (aload 0) ;; this
    1813     (cond ((equal super +lisp-compiled-function-class+)
    1814            (emit-constructor-lambda-name lambda-name)
    1815            (emit-constructor-lambda-list args)
    1816            (emit-push-nil) ;; body
    1817            (emit 'aconst_null) ;; environment
    1818            (emit-invokespecial-init super
    1819                                     (list +lisp-object+ +lisp-object+
    1820                                           +lisp-object+ +lisp-environment+)))
    1821           ((equal super +lisp-primitive-class+)
     1812    (cond ((equal super +lisp-primitive-class+)
    18221813           (emit-constructor-lambda-name lambda-name)
    18231814           (emit-constructor-lambda-list args)
     
    82088199          (cond
    82098200            ((and *child-p* *closure-variables*) +lisp-compiled-closure-class+)
    8210             (*hairy-arglist-p* +lisp-compiled-function-class+)
     8201            (*hairy-arglist-p* +lisp-compiled-closure-class+)
    82118202            (t +lisp-primitive-class+)))
    82128203
Note: See TracChangeset for help on using the changeset viewer.