Changeset 12794

Timestamp:

07/08/10 22:27:21 (13 years ago)

Author:

ehuelsmann

Message:

CLASS-NAME integration for +lisp-character+.

Location:

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

Files:

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

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

@@ -213 +213 @@
 (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;")
@@ -555 +553 @@
 (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 /
@@ -578 +576 @@
 (defvar rep-classes
   `((:boolean . ,+lisp-object+)
-    (:char    . ,+!lisp-character+)
+    (:char    . ,+lisp-character+)
     (:int     . ,+!lisp-integer+)
     (:long    . ,+!lisp-integer+)
@@ -742 +740 @@
   (let ((instanceof-class (ecase expected-type
                             (SYMBOL     +lisp-symbol+)
-                            (CHARACTER  +lisp-character-class+)
+                            (CHARACTER  +lisp-character+)
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)
@@ -2045 +2043 @@
   "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+))
 
@@ -2111 +2109 @@
 (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+)
@@ -3272 +3270 @@
 
 (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
@@ -4593 +4591 @@
 
 (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)
@@ -7432 +7430 @@
   (let ((instanceof-class (ecase expected-type
                             (SYMBOL     +lisp-symbol+)
-                            (CHARACTER  +lisp-character-class+)
+                            (CHARACTER  +lisp-character+)
                             (CONS       +lisp-cons+)
                             (HASH-TABLE +lisp-hash-table+)

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

@@ -120 +120 @@
 (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")