Changeset 13594


Ignore:
Timestamp:
09/11/11 19:48:21 (10 years ago)
Author:
ehuelsmann
Message:

Fix out-of-date function calls (fixes test suite failures which were
'failing for the wrong reasons').

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/test/lisp/abcl/class-file.lisp

    r12944 r13594  
    160160
    161161(deftest make-class-file.1
    162     (let* ((class (jvm::make-class-name "org/armedbear/lisp/mcf_1"))
     162    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/mcf_1"))
    163163           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
    164164      (jvm::class-add-field file (jvm::make-field "ABC" :int))
    165165      (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
    166       (jvm::class-add-method file (jvm::make-method "MBC" nil :int))
    167       (jvm::class-add-method file (jvm::make-method "MBD" nil jvm::+lisp-object+))
    168       (jvm::class-add-method file (jvm::make-method :constructor :void nil))
    169       (jvm::class-add-method file (jvm::make-method :static-initializer :void nil))
     166      (jvm::class-add-method file (jvm::make-jvm-method "MBC" nil :int))
     167      (jvm::class-add-method file (jvm::make-jvm-method "MBD" nil jvm::+lisp-object+))
     168      (jvm::class-add-method file (jvm::make-jvm-method :constructor :void nil))
     169      (jvm::class-add-method file (jvm::make-jvm-method :static-initializer :void nil))
    170170      T)
    171171  T)
    172172
    173173(deftest finalize-class-file.1
    174     (let* ((class (jvm::make-class-name "org/armedbear/lisp/fcf_1"))
     174    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/fcf_1"))
    175175           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
    176176      (jvm::class-add-field file (jvm::make-field "ABC" :int))
    177177      (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
    178       (jvm::class-add-method file (jvm::make-method "MBC" nil '(:int)))
     178      (jvm::class-add-method file (jvm::make-jvm-method "MBC" nil '(:int)))
    179179      (jvm::class-add-method file
    180                              (jvm::make-method "MBD" nil
     180                             (jvm::make-jvm-method "MBD" nil
    181181                                                (list jvm::+lisp-object+)))
    182182      (jvm::finalize-class-file file)
     
    186186
    187187(deftest generate-method.1
    188     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_1"))
     188    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_1"))
    189189           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
    190            (method (jvm::make-method :static-initializer :void nil
     190           (method (jvm::make-jvm-method :static-initializer :void nil
    191191                                      :flags '(:static))))
    192192      (jvm::class-add-method file method)
     
    201201
    202202(deftest generate-method.2
    203     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_2"))
     203    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_2"))
    204204           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
    205            (method (jvm::make-method "doNothing" :void nil)))
     205           (method (jvm::make-jvm-method "doNothing" :void nil)))
    206206      (jvm::class-add-method file method)
    207207      (jvm::with-code-to-method (file method)
     
    226226;; generation of an ABCL-like function class
    227227(deftest generate-method.3
    228     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_3"))
     228    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_3"))
    229229           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    230230           )
    231       (let ((method (jvm::make-method :constructor :void nil)))
     231      (let ((method (jvm::make-jvm-method :constructor :void nil)))
    232232        (jvm::class-add-method file method)
    233233        (jvm::with-code-to-method (file method)
     
    239239                                              jvm::+lisp-object+))
    240240          (jvm::emit 'return)))
    241       (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
     241      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
    242242        (jvm::class-add-method file method)
    243243        (jvm::with-code-to-method (file method)
     
    253253;; static field
    254254(deftest generate-method.4
    255     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_4"))
     255    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_4"))
    256256           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    257257           )
    258258      (jvm::class-add-field file (jvm::make-field "N1" jvm::+lisp-object+
    259259                                                  :flags '(:static :private)))
    260       (let ((method (jvm::make-method :static-initializer :void nil :flags '(:static))))
     260      (let ((method (jvm::make-jvm-method :static-initializer :void nil :flags '(:static))))
    261261        (jvm::class-add-method file method)
    262262        (jvm::with-code-to-method (file method)
     
    264264          (jvm::emit-putstatic class "N1" jvm::+lisp-object+)
    265265          (jvm::emit 'return)))
    266       (let ((method (jvm::make-method :constructor :void nil)))
     266      (let ((method (jvm::make-jvm-method :constructor :void nil)))
    267267        (jvm::class-add-method file method)
    268268        (jvm::with-code-to-method (file method)
     
    274274                                              jvm::+lisp-object+))
    275275          (jvm::emit 'return)))
    276       (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
     276      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
    277277        (jvm::class-add-method file method)
    278278        (jvm::with-code-to-method (file method)
     
    288288;; generation of ABCL-like function class with multiple 'execute' methods
    289289(deftest generate-method.5
    290     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_5"))
     290    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_5"))
    291291           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    292292           )
    293       (let ((method (jvm::make-method :constructor :void nil)))
     293      (let ((method (jvm::make-jvm-method :constructor :void nil)))
    294294        (jvm::class-add-method file method)
    295295        (jvm::with-code-to-method (file method)
     
    301301                                              jvm::+lisp-object+))
    302302          (jvm::emit 'return)))
    303       (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
     303      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
    304304        (jvm::class-add-method file method)
    305305        (jvm::with-code-to-method (file method)
    306306          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
    307307          (jvm::emit 'jvm::areturn)))
    308       (let ((method (jvm::make-method "execute" jvm::+lisp-object+
     308      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+
    309309                                       (list jvm::+lisp-object+))))
    310310        (jvm::class-add-method file method)
     
    322322;;Nested with-code-to-method
    323323(deftest with-code-to-method.1
    324     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_6"))
     324    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_6"))
    325325           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
    326            (method (jvm::make-method :static-initializer :void nil
     326           (method (jvm::make-jvm-method :static-initializer :void nil
    327327              :flags '(:static)))
    328328     (registers nil))
    329329      (jvm::class-add-method file method)
    330330      (jvm::with-code-to-method (file method)
    331   (jvm::allocate-register)
     331  (jvm::allocate-register :int)
    332332  (push jvm::*register* registers)
    333333  (jvm::with-code-to-method (file method)
    334     (jvm::allocate-register)
     334    (jvm::allocate-register :int)
    335335    (push jvm::*register* registers)
    336336    (jvm::with-code-to-method (file method)
    337       (jvm::allocate-register)
     337      (jvm::allocate-register :int)
    338338      (push jvm::*register* registers))
    339     (jvm::allocate-register)
     339    (jvm::allocate-register :int)
    340340    (push jvm::*register* registers))
    341   (jvm::allocate-register)
     341  (jvm::allocate-register :int)
    342342  (push jvm::*register* registers))
    343343      (jvm::finalize-class-file file)
     
    346346
    347347(deftest with-code-to-method.2
    348     (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_7"))
     348    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_7"))
    349349           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
    350            (method1 (jvm::make-method :static-initializer :void nil
     350           (method1 (jvm::make-jvm-method :static-initializer :void nil
    351351               :flags '(:static)))
    352      (method2 (jvm::make-method "method2" :void nil))
     352     (method2 (jvm::make-jvm-method "method2" :void nil))
    353353     (registers nil))
    354354      (jvm::class-add-method file method1)
    355355      (jvm::class-add-method file method2)
    356356      (jvm::with-code-to-method (file method1)
    357   (jvm::allocate-register)
     357  (jvm::allocate-register :int)
    358358  (push jvm::*register* registers)
    359359  (jvm::with-code-to-method (file method2)
    360     (jvm::allocate-register)
     360    (jvm::allocate-register :int)
    361361    (push jvm::*register* registers)
    362362    (jvm::with-code-to-method (file method1)
    363       (jvm::allocate-register)
     363      (jvm::allocate-register :int)
    364364      (push jvm::*register* registers))
    365     (jvm::allocate-register)
     365    (jvm::allocate-register :int)
    366366    (push jvm::*register* registers))
    367   (jvm::allocate-register)
     367  (jvm::allocate-register :int)
    368368  (push jvm::*register* registers))
    369369      (jvm::finalize-class-file file)
     
    374374;; ;;  static initializer and function method(s)
    375375;; (deftest generate-method.6
    376 ;;     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_6"))
     376;;     (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_6"))
    377377;;            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    378378;;            )
Note: See TracChangeset for help on using the changeset viewer.