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

Timestamp:

08/09/10 12:50:32 (13 years ago)

Author:

ehuelsmann

Message:

Switch fields to the new generator.

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (3 diffs)

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

@@ -1147 +1147 @@
 (defknown declare-field (t t t) t)
 (defun declare-field (name descriptor)
-  (if nil ;; *current-code-attribute*
-      (let ((field (!make-field name descriptor
-                                :flags '(:final :static :private))))
-        (class-add-field *class-file* field))
-      (let ((field (make-field name (internal-field-ref descriptor))))
-        ;; final static <access-flags>
-        (setf (field-access-flags field)
-              (logior +field-flag-final+ +field-flag-static+
-                      +field-access-private+))
-        (setf (field-name-index field) (pool-name (field-name field)))
-        (setf (field-descriptor-index field)
-              (pool-name (field-descriptor field)))
-        (push field *fields*))))
+  (let ((field (!make-field name descriptor
+                            :flags '(:final :static :private))))
+    (class-add-field *class-file* field)))
 
 (defknown sanitize (symbol) string)
@@ -7068 +7058 @@
                (fixnump *source-line-number*))
       (pool-name "LineNumberTable")) ; Must be in pool!
-    
+    (dolist (field (class-file-fields class-file))
+      (finalize-field field class-file))
+
     (write-u4 #xCAFEBABE stream)
     (write-u2 3 stream)
@@ -7080 +7072 @@
     (write-u2 0 stream)
     ;; fields count
-    (write-u2 (length *fields*) stream)
+    (write-u2 (length (class-file-fields class-file)) stream)
     ;; fields
-    (dolist (field *fields*)
-      (write-field field stream))
+    (dolist (field (class-file-fields class-file))
+      (!write-field field stream))
     ;; methods count
     (write-u2 (1+ (length (abcl-class-file-methods class-file))) stream)