Changeset 11898 for trunk/abcl/src/org/armedbear/lisp/jvm.lisp

Timestamp:

05/18/09 21:21:02 (14 years ago)

Author:

ehuelsmann

Message:

Revert r11892 and r11896 because they keep causing breakage
in different places.

We need general infrastructure for this problem. To come.

File:

• trunk/abcl/src/org/armedbear/lisp/jvm.lisp (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -88 +88 @@
 (defvar *declared-floats* nil)
 (defvar *declared-doubles* nil)
-(defvar *declared-objects* nil)
 
 (defstruct (class-file (:constructor %make-class-file))
@@ -107 +106 @@
   (integers (make-hash-table :test 'eql))
   (floats (make-hash-table :test 'eql))
-  (doubles (make-hash-table :test 'eql))
-  (objects (make-hash-table :test 'equal)))
+  (doubles (make-hash-table :test 'eql)))
 
 (defun class-name-from-filespec (filespec)
@@ -140 +138 @@
             (*declared-integers*  (class-file-integers ,var))
             (*declared-floats*    (class-file-floats ,var))
-            (*declared-doubles*   (class-file-doubles ,var))
-            (*declared-objects*   (class-file-objects ,var)))
+            (*declared-doubles*   (class-file-doubles ,var)))
        (progn ,@body)
        (setf (class-file-pool ,var)         *pool*
@@ -153 +150 @@
              (class-file-integers ,var)     *declared-integers*
              (class-file-floats ,var)       *declared-floats*
-             (class-file-doubles ,var)      *declared-doubles*
-             (class-file-objects ,var)      *declared-objects*))))
+             (class-file-doubles ,var)      *declared-doubles*))))
 
 (defstruct compiland