[armedbear-cvs] r12764 - branches/generic-class-file/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Jun 21 17:58:29 2010
New Revision: 12764

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

Modified:
   branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp
   branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
   branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/compile-system.lisp	Mon Jun 21 17:58:29 2010
@@ -97,6 +97,7 @@
       (load (do-compile "precompiler.lisp"))
       (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"))
       (load (do-compile "compiler-macro.lisp"))

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Mon Jun 21 17:58:29 2010
@@ -1751,10 +1751,9 @@
   name-index
   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
   max-stack
@@ -4905,7 +4904,7 @@
 (defmacro with-temp-class-file (pathname class-file lambda-list &body body)
   `(let* ((,pathname (make-temp-file))
 	  (,class-file (make-class-file :pathname ,pathname
-				       :lambda-list ,lambda-list)))
+                                             :lambda-list ,lambda-list)))
      (unwind-protect
 	  (progn , at body)
        (delete-file pathname))))

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm.lisp	Mon Jun 21 17:58:29 2010
@@ -45,6 +45,7 @@
   (require "KNOWN-SYMBOLS")
   (require "DUMP-FORM")
   (require "OPCODES")
+  (require "JVM-CLASS-FILE")
   (require "JAVA")
   (require "COMPILER-PASS1")
   (require "COMPILER-PASS2"))
@@ -85,17 +86,14 @@
 (defvar *externalized-objects* nil)
 (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
   (functions (make-hash-table :test 'equal)) ;; because of (SETF ...) functions