Changeset 12795

Timestamp:

07/08/10 22:50:02 (13 years ago)

Author:

ehuelsmann

Message:

CLASS-NAME integration for +lisp-integer+.

Location:

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

Files:

• compiler-pass2.lisp (modified) (3 diffs)
• jvm-class-file.lisp (modified) (1 diff)

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

@@ -202 +202 @@
 (defconstant +lisp-object-array+ "[Lorg/armedbear/lisp/LispObject;")
 (defconstant +closure-binding-array+ "[Lorg/armedbear/lisp/ClosureBinding;")
-(defconstant +lisp-integer-class+ "org/armedbear/lisp/LispInteger")
-(defconstant +lisp-integer+ "Lorg/armedbear/lisp/LispInteger;")
 (defconstant +lisp-fixnum-class+ "org/armedbear/lisp/Fixnum")
 (defconstant +lisp-fixnum+ "Lorg/armedbear/lisp/Fixnum;")
@@ -577 +575 @@
   `((:boolean . ,+lisp-object+)
     (:char    . ,+lisp-character+)
-    (:int     . ,+!lisp-integer+)
-    (:long    . ,+!lisp-integer+)
+    (:int     . ,+lisp-integer+)
+    (:long    . ,+lisp-integer+)
     (:float   . ,+!lisp-single-float+)
     (:double  . ,+!lisp-double-float+))
@@ -2108 +2106 @@
 
 (defvar serialization-table
-  `((integer "INT" ,#'eql ,#'serialize-integer ,+!lisp-integer+)
+  `((integer "INT" ,#'eql ,#'serialize-integer ,+lisp-integer+)
     (character "CHR" ,#'eql ,#'serialize-character ,+lisp-character+)
     (single-float "FLT" ,#'eql ,#'serialize-float ,+!lisp-single-float+)

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

@@ -113 +113 @@
 (define-class-name +lisp-thread+ "org.armedbear.lisp.LispThread")
 (define-class-name +lisp-closure-binding+ "org.armedbear.lisp.ClosureBinding")
-(define-class-name +!lisp-integer+ "org.armedbear.lisp.LispInteger")
+(define-class-name +lisp-integer+ "org.armedbear.lisp.LispInteger")
 (define-class-name +!lisp-fixnum+ "org.armedbear.lisp.Fixnum")
 (define-class-name +!lisp-bignum+ "org.armedbear.lisp.Bignum")