Changeset 12794


Ignore:
Timestamp:
07/08/10 22:27:21 (12 years ago)
Author:
ehuelsmann
Message:

CLASS-NAME integration for +lisp-character+.

Location:
branches/generic-class-file/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12793 r12794  
    213213(defconstant +lisp-double-float-class+ "org/armedbear/lisp/DoubleFloat")
    214214(defconstant +lisp-double-float+ "Lorg/armedbear/lisp/DoubleFloat;")
    215 (defconstant +lisp-character-class+ "org/armedbear/lisp/LispCharacter")
    216 (defconstant +lisp-character+ "Lorg/armedbear/lisp/LispCharacter;")
    217215(defconstant +lisp-character-array+ "[Lorg/armedbear/lisp/LispCharacter;")
    218216(defconstant +lisp-closure-parameter-array+ "[Lorg/armedbear/lisp/Closure$Parameter;")
     
    555553(defun emit-unbox-character ()
    556554  (cond ((> *safety* 0)
    557          (emit-invokestatic +lisp-character-class+ "getValue"
     555         (emit-invokestatic +lisp-character+ "getValue"
    558556                            (lisp-object-arg-types 1) "C"))
    559557        (t
    560          (emit 'checkcast +lisp-character-class+)
    561          (emit 'getfield +lisp-character-class+ "value" "C"))))
     558         (emit 'checkcast +lisp-character+)
     559         (emit 'getfield +lisp-character+ "value" "C"))))
    562560
    563561;;                     source type /
     
    578576(defvar rep-classes
    579577  `((:boolean . ,+lisp-object+)
    580     (:char    . ,+!lisp-character+)
     578    (:char    . ,+lisp-character+)
    581579    (:int     . ,+!lisp-integer+)
    582580    (:long    . ,+!lisp-integer+)
     
    742740  (let ((instanceof-class (ecase expected-type
    743741                            (SYMBOL     +lisp-symbol+)
    744                             (CHARACTER  +lisp-character-class+)
     742                            (CHARACTER  +lisp-character+)
    745743                            (CONS       +lisp-cons+)
    746744                            (HASH-TABLE +lisp-hash-table+)
     
    20452043  "Generates code to restore a serialized character."
    20462044  (emit-push-constant-int (char-code c))
    2047   (emit-invokestatic +lisp-character-class+ "getInstance" '("C")
     2045  (emit-invokestatic +lisp-character+ "getInstance" '("C")
    20482046                     +lisp-character+))
    20492047
     
    21112109(defvar serialization-table
    21122110  `((integer "INT" ,#'eql ,#'serialize-integer ,+!lisp-integer+)
    2113     (character "CHR" ,#'eql ,#'serialize-character ,+!lisp-character+)
     2111    (character "CHR" ,#'eql ,#'serialize-character ,+lisp-character+)
    21142112    (single-float "FLT" ,#'eql ,#'serialize-float ,+!lisp-single-float+)
    21152113    (double-float "DBL" ,#'eql ,#'serialize-double ,+!lisp-double-float+)
     
    32723270
    32733271(defun p2-test-characterp (form)
    3274   (p2-test-instanceof-predicate form +lisp-character-class+))
     3272  (p2-test-instanceof-predicate form +lisp-character+))
    32753273
    32763274;; constantp form &optional environment => generalized-boolean
     
    45934591
    45944592(defun p2-characterp (form target representation)
    4595   (p2-instanceof-predicate form target representation +lisp-character-class+))
     4593  (p2-instanceof-predicate form target representation +lisp-character+))
    45964594
    45974595(defun p2-consp (form target representation)
     
    74327430  (let ((instanceof-class (ecase expected-type
    74337431                            (SYMBOL     +lisp-symbol+)
    7434                             (CHARACTER  +lisp-character-class+)
     7432                            (CHARACTER  +lisp-character+)
    74357433                            (CONS       +lisp-cons+)
    74367434                            (HASH-TABLE +lisp-hash-table+)
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/jvm-class-file.lisp

    r12792 r12794  
    120120(define-class-name +lisp-cons+ "org.armedbear.lisp.Cons")
    121121(define-class-name +lisp-load+ "org.armedbear.lisp.Load")
    122 (define-class-name +!lisp-character+ "org.armedbear.lisp.LispCharacter")
     122(define-class-name +lisp-character+ "org.armedbear.lisp.LispCharacter")
    123123(define-class-name +lisp-structure-object+ "org.armedbear.lisp.StructureObject")
    124124(define-class-name +lisp-simple-vector+ "org.armedbear.lisp.SimpleVector")
Note: See TracChangeset for help on using the changeset viewer.