Changeset 13594

Timestamp:

09/11/11 19:48:21 (11 years ago)

Author:

ehuelsmann

Message:

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

File:

• trunk/abcl/test/lisp/abcl/class-file.lisp (modified) (13 diffs)

trunk/abcl/test/lisp/abcl/class-file.lisp

@@ -160 +160 @@
 
 (deftest make-class-file.1
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/mcf_1"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/mcf_1"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
       (jvm::class-add-field file (jvm::make-field "ABC" :int))
       (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::make-method "MBC" nil :int))
-      (jvm::class-add-method file (jvm::make-method "MBD" nil jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::make-method :constructor :void nil))
-      (jvm::class-add-method file (jvm::make-method :static-initializer :void nil))
+      (jvm::class-add-method file (jvm::make-jvm-method "MBC" nil :int))
+      (jvm::class-add-method file (jvm::make-jvm-method "MBD" nil jvm::+lisp-object+))
+      (jvm::class-add-method file (jvm::make-jvm-method :constructor :void nil))
+      (jvm::class-add-method file (jvm::make-jvm-method :static-initializer :void nil))
       T)
   T)
 
 (deftest finalize-class-file.1
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/fcf_1"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/fcf_1"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public))))
       (jvm::class-add-field file (jvm::make-field "ABC" :int))
       (jvm::class-add-field file (jvm::make-field "ABD" jvm::+lisp-object+))
-      (jvm::class-add-method file (jvm::make-method "MBC" nil '(:int)))
+      (jvm::class-add-method file (jvm::make-jvm-method "MBC" nil '(:int)))
       (jvm::class-add-method file
-                             (jvm::make-method "MBD" nil
+                             (jvm::make-jvm-method "MBD" nil
                                                 (list jvm::+lisp-object+)))
       (jvm::finalize-class-file file)
@@ -186 +186 @@
 
 (deftest generate-method.1
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_1"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_1"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::make-method :static-initializer :void nil
+           (method (jvm::make-jvm-method :static-initializer :void nil
                                       :flags '(:static))))
       (jvm::class-add-method file method)
@@ -201 +201 @@
 
 (deftest generate-method.2
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_2"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_2"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::make-method "doNothing" :void nil)))
+           (method (jvm::make-jvm-method "doNothing" :void nil)))
       (jvm::class-add-method file method)
       (jvm::with-code-to-method (file method)
@@ -226 +226 @@
 ;; generation of an ABCL-like function class
 (deftest generate-method.3
-    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_3"))
+    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_3"))
            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
-      (let ((method (jvm::make-method :constructor :void nil)))
+      (let ((method (jvm::make-jvm-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -239 +239 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -253 +253 @@
 ;; static field
 (deftest generate-method.4
-    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_4"))
+    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_4"))
            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
       (jvm::class-add-field file (jvm::make-field "N1" jvm::+lisp-object+
                                                   :flags '(:static :private)))
-      (let ((method (jvm::make-method :static-initializer :void nil :flags '(:static))))
+      (let ((method (jvm::make-jvm-method :static-initializer :void nil :flags '(:static))))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -264 +264 @@
           (jvm::emit-putstatic class "N1" jvm::+lisp-object+)
           (jvm::emit 'return)))
-      (let ((method (jvm::make-method :constructor :void nil)))
+      (let ((method (jvm::make-jvm-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -274 +274 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -288 +288 @@
 ;; generation of ABCL-like function class with multiple 'execute' methods
 (deftest generate-method.5
-    (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_5"))
+    (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_5"))
            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
            )
-      (let ((method (jvm::make-method :constructor :void nil)))
+      (let ((method (jvm::make-jvm-method :constructor :void nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
@@ -301 +301 @@
                                               jvm::+lisp-object+))
           (jvm::emit 'return)))
-      (let ((method (jvm::make-method "execute" jvm::+lisp-object+ nil)))
+      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+ nil)))
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
           (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
           (jvm::emit 'jvm::areturn)))
-      (let ((method (jvm::make-method "execute" jvm::+lisp-object+
+      (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+
                                        (list jvm::+lisp-object+))))
         (jvm::class-add-method file method)
@@ -322 +322 @@
 ;;Nested with-code-to-method
 (deftest with-code-to-method.1
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_6"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_6"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
-           (method (jvm::make-method :static-initializer :void nil
+           (method (jvm::make-jvm-method :static-initializer :void nil
               :flags '(:static)))
      (registers nil))
       (jvm::class-add-method file method)
       (jvm::with-code-to-method (file method)
-  (jvm::allocate-register)
+  (jvm::allocate-register :int)
   (push jvm::*register* registers)
   (jvm::with-code-to-method (file method)
-    (jvm::allocate-register)
+    (jvm::allocate-register :int)
     (push jvm::*register* registers)
     (jvm::with-code-to-method (file method)
-      (jvm::allocate-register)
+      (jvm::allocate-register :int)
       (push jvm::*register* registers))
-    (jvm::allocate-register)
+    (jvm::allocate-register :int)
     (push jvm::*register* registers))
-  (jvm::allocate-register)
+  (jvm::allocate-register :int)
   (push jvm::*register* registers))
       (jvm::finalize-class-file file)
@@ -346 +346 @@
 
 (deftest with-code-to-method.2
-    (let* ((class (jvm::make-class-name "org/armedbear/lisp/gm_7"))
+    (let* ((class (jvm::make-jvm-class-name "org/armedbear/lisp/gm_7"))
            (file (jvm::make-class-file class jvm::+lisp-object+ '(:public)))
-           (method1 (jvm::make-method :static-initializer :void nil
+           (method1 (jvm::make-jvm-method :static-initializer :void nil
                :flags '(:static)))
-     (method2 (jvm::make-method "method2" :void nil))
+     (method2 (jvm::make-jvm-method "method2" :void nil))
      (registers nil))
       (jvm::class-add-method file method1)
       (jvm::class-add-method file method2)
       (jvm::with-code-to-method (file method1)
-  (jvm::allocate-register)
+  (jvm::allocate-register :int)
   (push jvm::*register* registers)
   (jvm::with-code-to-method (file method2)
-    (jvm::allocate-register)
+    (jvm::allocate-register :int)
     (push jvm::*register* registers)
     (jvm::with-code-to-method (file method1)
-      (jvm::allocate-register)
+      (jvm::allocate-register :int)
       (push jvm::*register* registers))
-    (jvm::allocate-register)
+    (jvm::allocate-register :int)
     (push jvm::*register* registers))
-  (jvm::allocate-register)
+  (jvm::allocate-register :int)
   (push jvm::*register* registers))
       (jvm::finalize-class-file file)
@@ -374 +374 @@
 ;; ;;  static initializer and function method(s)
 ;; (deftest generate-method.6
-;;     (let* ((class (jvm::make-class-name "org.armedbear.lisp.gm_6"))
+;;     (let* ((class (jvm::make-jvm-class-name "org.armedbear.lisp.gm_6"))
 ;;            (file (jvm::make-class-file class jvm::+lisp-primitive+ '(:public)))
 ;;            )