Changeset 13594
- Timestamp:
- 09/11/11 19:48:21 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/test/lisp/abcl/class-file.lisp
r12944 r13594 160 160 161 161 (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")) 163 163 (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))) 164 164 (jvm::class-add-field file (jvm::make-field "ABC" :int)) 165 165 (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)) 170 170 T) 171 171 T) 172 172 173 173 (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")) 175 175 (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))) 176 176 (jvm::class-add-field file (jvm::make-field "ABC" :int)) 177 177 (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))) 179 179 (jvm::class-add-method file 180 (jvm::make- method "MBD" nil180 (jvm::make-jvm-method "MBD" nil 181 181 (list jvm::+lisp-object+))) 182 182 (jvm::finalize-class-file file) … … 186 186 187 187 (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")) 189 189 (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))) 190 (method (jvm::make- method :static-initializer :void nil190 (method (jvm::make-jvm-method :static-initializer :void nil 191 191 :flags '(:static)))) 192 192 (jvm::class-add-method file method) … … 201 201 202 202 (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")) 204 204 (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))) 206 206 (jvm::class-add-method file method) 207 207 (jvm::with-code-to-method (file method) … … 226 226 ;; generation of an ABCL-like function class 227 227 (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")) 229 229 (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public))) 230 230 ) 231 (let ((method (jvm::make- method :constructor :void nil)))231 (let ((method (jvm::make-jvm-method :constructor :void nil))) 232 232 (jvm::class-add-method file method) 233 233 (jvm::with-code-to-method (file method) … … 239 239 jvm::+lisp-object+)) 240 240 (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))) 242 242 (jvm::class-add-method file method) 243 243 (jvm::with-code-to-method (file method) … … 253 253 ;; static field 254 254 (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")) 256 256 (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public))) 257 257 ) 258 258 (jvm::class-add-field file (jvm::make-field "N1" jvm::+lisp-object+ 259 259 :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)))) 261 261 (jvm::class-add-method file method) 262 262 (jvm::with-code-to-method (file method) … … 264 264 (jvm::emit-putstatic class "N1" jvm::+lisp-object+) 265 265 (jvm::emit 'return))) 266 (let ((method (jvm::make- method :constructor :void nil)))266 (let ((method (jvm::make-jvm-method :constructor :void nil))) 267 267 (jvm::class-add-method file method) 268 268 (jvm::with-code-to-method (file method) … … 274 274 jvm::+lisp-object+)) 275 275 (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))) 277 277 (jvm::class-add-method file method) 278 278 (jvm::with-code-to-method (file method) … … 288 288 ;; generation of ABCL-like function class with multiple 'execute' methods 289 289 (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")) 291 291 (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public))) 292 292 ) 293 (let ((method (jvm::make- method :constructor :void nil)))293 (let ((method (jvm::make-jvm-method :constructor :void nil))) 294 294 (jvm::class-add-method file method) 295 295 (jvm::with-code-to-method (file method) … … 301 301 jvm::+lisp-object+)) 302 302 (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))) 304 304 (jvm::class-add-method file method) 305 305 (jvm::with-code-to-method (file method) 306 306 (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+) 307 307 (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+ 309 309 (list jvm::+lisp-object+)))) 310 310 (jvm::class-add-method file method) … … 322 322 ;;Nested with-code-to-method 323 323 (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")) 325 325 (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))) 326 (method (jvm::make- method :static-initializer :void nil326 (method (jvm::make-jvm-method :static-initializer :void nil 327 327 :flags '(:static))) 328 328 (registers nil)) 329 329 (jvm::class-add-method file method) 330 330 (jvm::with-code-to-method (file method) 331 (jvm::allocate-register )331 (jvm::allocate-register :int) 332 332 (push jvm::*register* registers) 333 333 (jvm::with-code-to-method (file method) 334 (jvm::allocate-register )334 (jvm::allocate-register :int) 335 335 (push jvm::*register* registers) 336 336 (jvm::with-code-to-method (file method) 337 (jvm::allocate-register )337 (jvm::allocate-register :int) 338 338 (push jvm::*register* registers)) 339 (jvm::allocate-register )339 (jvm::allocate-register :int) 340 340 (push jvm::*register* registers)) 341 (jvm::allocate-register )341 (jvm::allocate-register :int) 342 342 (push jvm::*register* registers)) 343 343 (jvm::finalize-class-file file) … … 346 346 347 347 (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")) 349 349 (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))) 350 (method1 (jvm::make- method :static-initializer :void nil350 (method1 (jvm::make-jvm-method :static-initializer :void nil 351 351 :flags '(:static))) 352 (method2 (jvm::make- method "method2" :void nil))352 (method2 (jvm::make-jvm-method "method2" :void nil)) 353 353 (registers nil)) 354 354 (jvm::class-add-method file method1) 355 355 (jvm::class-add-method file method2) 356 356 (jvm::with-code-to-method (file method1) 357 (jvm::allocate-register )357 (jvm::allocate-register :int) 358 358 (push jvm::*register* registers) 359 359 (jvm::with-code-to-method (file method2) 360 (jvm::allocate-register )360 (jvm::allocate-register :int) 361 361 (push jvm::*register* registers) 362 362 (jvm::with-code-to-method (file method1) 363 (jvm::allocate-register )363 (jvm::allocate-register :int) 364 364 (push jvm::*register* registers)) 365 (jvm::allocate-register )365 (jvm::allocate-register :int) 366 366 (push jvm::*register* registers)) 367 (jvm::allocate-register )367 (jvm::allocate-register :int) 368 368 (push jvm::*register* registers)) 369 369 (jvm::finalize-class-file file) … … 374 374 ;; ;; static initializer and function method(s) 375 375 ;; (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")) 377 377 ;; (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public))) 378 378 ;; )
Note: See TracChangeset
for help on using the changeset viewer.