Changeset 13167
- Timestamp:
- 01/21/11 20:57:57 (12 years ago)
- Location:
- branches/0.24.x/abcl/src/org/armedbear/lisp
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.24.x/abcl/src/org/armedbear/lisp/FaslClassLoader.java
r13162 r13167 40 40 public class FaslClassLoader extends JavaClassLoader { 41 41 42 private String baseName; 43 private LispObject loader; //The function used to load FASL functions by number 42 private final String baseName; 44 43 private final JavaObject boxedThis = new JavaObject(this); 45 44 … … 64 63 Class<?> c = this.findLoadedClass(internalName); 65 64 66 if (c == null) 65 if (c == null) { 67 66 c = findClass(name); 68 67 } 69 68 if (c != null) { 70 if (resolve) 69 if (resolve) { 71 70 resolveClass(c); 72 71 } 73 72 return c; 74 73 } … … 109 108 try { 110 109 //Function name is fnIndex + 1 111 LispObject o = (LispObject) loadClass(baseName + "_" + (fnNumber + 1)).newInstance(); 112 return o; 110 String name = baseName + "_" + (fnNumber + 1); 111 Function f = (Function) loadClass(name).newInstance(); 112 f.setClassBytes(getFunctionClassBytes(name)); 113 return f; 113 114 } catch(Exception e) { 114 115 if(e instanceof ControlTransfer) { throw (ControlTransfer) e; } … … 129 130 } 130 131 132 @Override 133 //TODO delete this next time the fasl version is bumbed 134 public LispObject execute(LispObject unused1, LispObject baseName, LispObject unused2) { 135 return execute(baseName); 136 } 137 131 138 }; 132 139 -
branches/0.24.x/abcl/src/org/armedbear/lisp/Lisp.java
r13108 r13167 1285 1285 if (input == null) { 1286 1286 Debug.trace("Pathname: " + name); 1287 Debug.trace("load: " + load); 1287 1288 Debug.trace("LOAD_TRUENAME_FASL: " + truenameFasl); 1288 1289 Debug.trace("LOAD_TRUENAME: " + truename); -
branches/0.24.x/abcl/src/org/armedbear/lisp/Load.java
r13064 r13167 343 343 // ### *fasl-version* 344 344 // internal symbol 345 346 /* TODO when bumping the version for any reason, remember to: 347 * - remove the overload taking 3 args in 348 * FaslClassLoader.MAKE_FASL_CLASS_LOADER 349 * - remove the extra args (1 and 3, both NIL) passed to 350 * make-fasl-class-loader in compile-file.lisp 351 * - delete this comment :) 352 */ 345 353 static final Symbol _FASL_VERSION_ = 346 354 exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(37)); -
branches/0.24.x/abcl/src/org/armedbear/lisp/compile-file.lisp
r13162 r13167 370 370 (let ((*load-truename* *output-file-pathname*) 371 371 (*fasl-loader* (make-fasl-class-loader 372 (concatenate 'string "org.armedbear.lisp." (base-classname))))) 372 nil 373 (concatenate 'string "org.armedbear.lisp." (base-classname)) 374 nil))) 373 375 (eval form)))) 374 376 … … 612 614 (write (list 'setq '*fasl-loader* 613 615 `(sys::make-fasl-class-loader 614 ,(concatenate 'string "org.armedbear.lisp." (base-classname)))) :stream out)) 616 nil 617 ,(concatenate 'string "org.armedbear.lisp." (base-classname)) 618 nil)) :stream out)) 615 619 (%stream-terpri out)) 616 620
Note: See TracChangeset
for help on using the changeset viewer.