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

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Jul  8 18:50:02 2010
New Revision: 12795

Log:
CLASS-NAME integration for +lisp-integer+.

Modified:
   branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
   branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.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	Thu Jul  8 18:50:02 2010
@@ -201,8 +201,6 @@
 
 (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;")
 (defconstant +lisp-fixnum-array+ "[Lorg/armedbear/lisp/Fixnum;")
@@ -576,8 +574,8 @@
 (defvar rep-classes
   `((: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+))
   "Lists the class on which to call the `getInstance' method on,
@@ -2107,7 +2105,7 @@
                           +lisp-symbol+)))))
 
 (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+)
     (double-float "DBL" ,#'eql ,#'serialize-double ,+!lisp-double-float+)

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	Thu Jul  8 18:50:02 2010
@@ -112,7 +112,7 @@
 (define-class-name +lisp-symbol+ "org.armedbear.lisp.Symbol")
 (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")
 (define-class-name +!lisp-single-float+ "org.armedbear.lisp.SingleFloat")