Changeset 13792 for trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp

Timestamp:

01/20/12 01:10:39 (12 years ago)

Author:

astalla

Message:

A small reorganization of compiler/jvm code. Runtime-class wasn't autoloading properly in certain situations due to a wrong dependency graph among some system files.

File:

• trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/runtime-class.lisp

@@ -1 @@
-(require "COMPILER-PASS2")
-(require "JVM-CLASS-FILE")
+(require "JVM")
 
 ;;The package is set to :jvm for convenience, since most of the symbols used
@@ -187 +186 @@
               (cond
                 ((jvm-class-name-p type) (aload 1))
-                ((eq type :int) (iload 1))
+                ((eq type :int) (emit 'iload 1))
                 (t (error "Unsupported setter parameter type: ~A" type)))
               (emit-putfield (class-file-class class-file) name type)
@@ -219 +218 @@
 
 ;;TODO:
+;; - Returning nil as null is broken
 ;; - Function calls with 8+ args
 ;; - super method invocation. Idea: generate companion methods super_... to use with plain jcall. Add a flag per method to optionally disable this when not needed.