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

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Jul  8 18:27:21 2010
New Revision: 12794

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

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:27:21 2010
@@ -212,8 +212,6 @@
 (defconstant +lisp-single-float+ "Lorg/armedbear/lisp/SingleFloat;")
 (defconstant +lisp-double-float-class+ "org/armedbear/lisp/DoubleFloat")
 (defconstant +lisp-double-float+ "Lorg/armedbear/lisp/DoubleFloat;")
-(defconstant +lisp-character-class+ "org/armedbear/lisp/LispCharacter")
-(defconstant +lisp-character+ "Lorg/armedbear/lisp/LispCharacter;")
 (defconstant +lisp-character-array+ "[Lorg/armedbear/lisp/LispCharacter;")
 (defconstant +lisp-closure-parameter-array+ "[Lorg/armedbear/lisp/Closure$Parameter;")
 
@@ -554,11 +552,11 @@
 (defknown emit-unbox-character () t)
 (defun emit-unbox-character ()
   (cond ((> *safety* 0)
-         (emit-invokestatic +lisp-character-class+ "getValue"
+         (emit-invokestatic +lisp-character+ "getValue"
                             (lisp-object-arg-types 1) "C"))
         (t
-         (emit 'checkcast +lisp-character-class+)
-         (emit 'getfield +lisp-character-class+ "value" "C"))))
+         (emit 'checkcast +lisp-character+)
+         (emit 'getfield +lisp-character+ "value" "C"))))
 
 ;;                     source type /
 ;;                         targets   :boolean :char    :int :long :float :double
@@ -577,7 +575,7 @@
 
 (defvar rep-classes
   `((:boolean . ,+lisp-object+)
-    (:char    . ,+!lisp-character+)
+    (:char    . ,+lisp-character+)
     (:int     . ,+!lisp-integer+)
     (:long    . ,+!lisp-integer+)
     (:float   . ,+!lisp-single-float+)
@@ -741,7 +739,7 @@
     (return-from generate-instanceof-type-check-for-variable))
   (let ((instanceof-class (ecase expected-type
                             (SYMBOL     +lisp-symbol+)
-                            (CHARACTER  +lisp-character-class+)
+                            (CHARACTER  +lisp-character+)
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)
                             (FIXNUM     +lisp-fixnum-class+)
@@ -2044,7 +2042,7 @@
 (defun serialize-character (c)
   "Generates code to restore a serialized character."
   (emit-push-constant-int (char-code c))
-  (emit-invokestatic +lisp-character-class+ "getInstance" '("C")
+  (emit-invokestatic +lisp-character+ "getInstance" '("C")
                      +lisp-character+))
 
 (defun serialize-float (s)
@@ -2110,7 +2108,7 @@
 
 (defvar serialization-table
   `((integer "INT" ,#'eql ,#'serialize-integer ,+!lisp-integer+)
-    (character "CHR" ,#'eql ,#'serialize-character ,+!lisp-character+)
+    (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+)
     (string "STR" ,#'equal ,#'serialize-string
@@ -3271,7 +3269,7 @@
   (p2-test-instanceof-predicate form +lisp-abstract-bit-vector+))
 
 (defun p2-test-characterp (form)
-  (p2-test-instanceof-predicate form +lisp-character-class+))
+  (p2-test-instanceof-predicate form +lisp-character+))
 
 ;; constantp form &optional environment => generalized-boolean
 (defun p2-test-constantp (form)
@@ -4592,7 +4590,7 @@
   (p2-instanceof-predicate form target representation +lisp-abstract-bit-vector+))
 
 (defun p2-characterp (form target representation)
-  (p2-instanceof-predicate form target representation +lisp-character-class+))
+  (p2-instanceof-predicate form target representation +lisp-character+))
 
 (defun p2-consp (form target representation)
   (p2-instanceof-predicate form target representation +lisp-cons+))
@@ -7431,7 +7429,7 @@
   (declare (type symbol expected-type))
   (let ((instanceof-class (ecase expected-type
                             (SYMBOL     +lisp-symbol+)
-                            (CHARACTER  +lisp-character-class+)
+                            (CHARACTER  +lisp-character+)
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)
                             (FIXNUM     +lisp-fixnum-class+)

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:27:21 2010
@@ -119,7 +119,7 @@
 (define-class-name +!lisp-double-float+ "org.armedbear.lisp.DoubleFloat")
 (define-class-name +lisp-cons+ "org.armedbear.lisp.Cons")
 (define-class-name +lisp-load+ "org.armedbear.lisp.Load")
-(define-class-name +!lisp-character+ "org.armedbear.lisp.LispCharacter")
+(define-class-name +lisp-character+ "org.armedbear.lisp.LispCharacter")
 (define-class-name +lisp-structure-object+ "org.armedbear.lisp.StructureObject")
 (define-class-name +lisp-simple-vector+ "org.armedbear.lisp.SimpleVector")
 (define-class-name +lisp-abstract-string+ "org.armedbear.lisp.AbstractString")