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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Jul  4 04:45:13 2010
New Revision: 12782

Log:
More fixes from test-writing.

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

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp	Sun Jul  4 04:45:13 2010
@@ -247,7 +247,11 @@
 (defun make-constant-long (index value)
   (%make-constant-double/long 5 index value))
 
-(defstruct (constant-name/type (:include constant
+(defstruct (constant-name/type (:constructor
+                                make-constant-name/type (index
+                                                         name-index
+                                                         descriptor-index))
+                               (:include constant
                                          (tag 12)))
   name-index
   descriptor-index)
@@ -368,16 +372,16 @@
       (push entry (pool-entries-list pool)))
     (constant-index entry)))
 
-(defstruct (class-file (:constructor %make-class-file))
-  constants
+(defstruct (class-file (:constructor
+                        !make-class-file (class superclass access-flags)))
+  (constants (make-pool))
   access-flags
   class
   superclass
   ;; interfaces
   fields
   methods
-  attributes
-  )
+  attributes)
 
 (defun class-add-field (class field)
   (push field (class-file-fields class)))