Changeset 12764

Timestamp:

06/21/10 21:58:29 (13 years ago)

Author:

ehuelsmann

Message:

Work-in-progress commit: saving current state;
no real functional changes.

Location:

branches/generic-class-file/abcl/src/org/armedbear/lisp

Files:

• compile-system.lisp (modified) (1 diff)
• compiler-pass2.lisp (modified) (2 diffs)
• jvm.lisp (modified) (2 diffs)

branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp

@@ -98 +98 @@
       (load (do-compile "compiler-pass1.lisp"))
       (load (do-compile "compiler-pass2.lisp"))
+      (load (do-compile "jvm-class-file.lisp"))
       (load (do-compile "jvm.lisp"))
       (load (do-compile "source-transform.lisp"))

branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -1752 +1752 @@
   descriptor-index)
 
-(defstruct (java-method (:conc-name method-) (:constructor %make-method))
-  access-flags
-  name
-  descriptor
+(defstruct (java-method (:include method)
+                        (:conc-name method-)
+                        (:constructor %make-method))
   name-index
   descriptor-index
@@ -4906 +4905 @@
   `(let* ((,pathname (make-temp-file))
     (,class-file (make-class-file :pathname ,pathname
-               :lambda-list ,lambda-list)))
+                                             :lambda-list ,lambda-list)))
      (unwind-protect
     (progn ,@body)

branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -46 +46 @@
   (require "DUMP-FORM")
   (require "OPCODES")
+  (require "JVM-CLASS-FILE")
   (require "JAVA")
   (require "COMPILER-PASS1")
@@ -86 +87 @@
 (defvar *declared-functions* nil)
 
-(defstruct (abcl-class-file (:constructor %make-abcl-class-file))
+(defstruct (abcl-class-file (:include class-file)
+                            (:constructor %make-abcl-class-file))
   pathname ; pathname of output file
   lambda-name
-  class
-  superclass
   lambda-list ; as advertised
   pool
   (pool-count 1)
   (pool-entries (make-hash-table :test #'equal))
-  fields
-  methods
   static-code
   objects ;; an alist of externalized objects and their field names