Changeset 12942


Ignore:
Timestamp:
10/03/10 09:08:55 (11 years ago)
Author:
ehuelsmann
Message:

Fix !-prefixed symbols: there are no duplicate symbols anymore;
replacement work has been done: everything is on trunk.

File:
1 edited

Legend:

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

    r12918 r12942  
    161161(deftest make-class-file.1
    162162    (let* ((class (jvm::make-class-name "org/armedbear/lisp/mcf_1"))
    163            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public))))
     163           (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 :class-constructor :void nil))
     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 :class-constructor :void nil))
    170170      T)
    171171  T)
     
    173173(deftest finalize-class-file.1
    174174    (let* ((class (jvm::make-class-name "org/armedbear/lisp/fcf_1"))
    175            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public))))
     175           (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-method "MBC" nil '(:int)))
    179179      (jvm::class-add-method file
    180                              (jvm::!make-method "MBD" nil
     180                             (jvm::make-method "MBD" nil
    181181                                                (list jvm::+lisp-object+)))
    182182      (jvm::finalize-class-file file)
     
    187187(deftest generate-method.1
    188188    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_1"))
    189            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
    190            (method (jvm::!make-method :class-constructor :void nil
     189           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
     190           (method (jvm::make-method :class-constructor :void nil
    191191                                      :flags '(:static))))
    192192      (jvm::class-add-method file method)
     
    195195      (jvm::finalize-class-file file)
    196196      (with-open-stream (stream (sys::%make-byte-array-output-stream))
    197         (jvm::!write-class-file file stream)
     197        (jvm::write-class-file file stream)
    198198        (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))
    199199      T)
     
    202202(deftest generate-method.2
    203203    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_2"))
    204            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
    205            (method (jvm::!make-method "doNothing" :void nil)))
     204           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
     205           (method (jvm::make-method "doNothing" :void nil)))
    206206      (jvm::class-add-method file method)
    207207      (jvm::with-code-to-method (file method)
     
    219219      (jvm::finalize-class-file file)
    220220      (with-open-stream (stream (sys::%make-byte-array-output-stream))
    221         (jvm::!write-class-file file stream)
     221        (jvm::write-class-file file stream)
    222222        (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))
    223223      T)
     
    227227(deftest generate-method.3
    228228    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_3"))
    229            (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
     229           (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-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-method "execute" jvm::+lisp-object+ nil)))
    242242        (jvm::class-add-method file method)
    243243        (jvm::with-code-to-method (file method)
     
    246246      (jvm::finalize-class-file file)
    247247      (with-open-stream (stream (sys::%make-byte-array-output-stream))
    248         (jvm::!write-class-file file stream)
     248        (jvm::write-class-file file stream)
    249249        (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))))
    250250  NIL)
     
    254254(deftest generate-method.4
    255255    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_4"))
    256            (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
     256           (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    257257           )
    258       (jvm::class-add-field file (jvm::!make-field "N1" jvm::+lisp-object+
     258      (jvm::class-add-field file (jvm::make-field "N1" jvm::+lisp-object+
    259259                                                  :flags '(:static :private)))
    260       (let ((method (jvm::!make-method :class-constructor :void nil :flags '(:static))))
     260      (let ((method (jvm::make-method :class-constructor :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-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-method "execute" jvm::+lisp-object+ nil)))
    277277        (jvm::class-add-method file method)
    278278        (jvm::with-code-to-method (file method)
     
    281281      (jvm::finalize-class-file file)
    282282      (with-open-stream (stream (sys::%make-byte-array-output-stream))
    283         (jvm::!write-class-file file stream)
     283        (jvm::write-class-file file stream)
    284284        (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream)))))
    285285  NIL)
     
    289289(deftest generate-method.5
    290290    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_5"))
    291            (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
     291           (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-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-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-method "execute" jvm::+lisp-object+
    309309                                       (list jvm::+lisp-object+))))
    310310        (jvm::class-add-method file method)
     
    314314      (jvm::finalize-class-file file)
    315315      (with-open-stream (stream (sys::%make-byte-array-output-stream))
    316         (jvm::!write-class-file file stream)
     316        (jvm::write-class-file file stream)
    317317        (let* ((bytes (sys::%get-output-stream-bytes stream))
    318318               (fn (sys::load-compiled-function bytes)))
     
    323323(deftest with-code-to-method.1
    324324    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_6"))
    325            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
    326            (method (jvm::!make-method :class-constructor :void nil
     325           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
     326           (method (jvm::make-method :class-constructor :void nil
    327327              :flags '(:static)))
    328328     (registers nil))
     
    347347(deftest with-code-to-method.2
    348348    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_7"))
    349            (file (jvm::!make-class-file class jvm::+lisp-object+ '(:public)))
    350            (method1 (jvm::!make-method :class-constructor :void nil
     349           (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
     350           (method1 (jvm::make-method :class-constructor :void nil
    351351               :flags '(:static)))
    352      (method2 (jvm::!make-method "method2" :void nil))
     352     (method2 (jvm::make-method "method2" :void nil))
    353353     (registers nil))
    354354      (jvm::class-add-method file method1)
     
    375375;; (deftest generate-method.6
    376376;;     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_6"))
    377 ;;            (file (jvm::!make-class-file class jvm::+lisp-primitive+ '(:public)))
     377;;            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
    378378;;            )
    379 ;;       (let ((method (jvm::!make-method :constructor :void nil)))
     379;;       (let ((method (jvm::make-method :constructor :void nil)))
    380380;;         (jvm::class-add-method file method)
    381381;;         (jvm::with-code-to-method (file method)
     
    387387;;                                               jvm::+lisp-object+))
    388388;;           (jvm::emit 'return)))
    389 ;;       (let ((method (jvm::!make-method "execute" jvm::+lisp-object+ nil)))
     389;;       (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
    390390;;         (jvm::class-add-method file method)
    391391;;         (jvm::with-code-to-method (file method)
     
    394394;;       (jvm::finalize-class-file file)
    395395;;       (with-open-stream (stream (sys::%make-byte-array-output-stream))
    396 ;;         (jvm::!write-class-file file stream)
     396;;         (jvm::write-class-file file stream)
    397397;;         (ignore-errors (sys::load-compiled-function nil))
    398398;;         (funcall (sys::load-compiled-function (sys::%get-output-stream-bytes stream))))
Note: See TracChangeset for help on using the changeset viewer.