[armedbear-cvs] r14095 - trunk/abcl/test/lisp/abcl

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Wed Aug 15 15:16:20 2012
New Revision: 14095

Log:
Fix test failures by fixing test incorrectnesses.

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

Modified: trunk/abcl/test/lisp/abcl/class-file.lisp
==============================================================================
--- trunk/abcl/test/lisp/abcl/class-file.lisp	Wed Aug 15 14:38:12 2012	(r14094)
+++ trunk/abcl/test/lisp/abcl/class-file.lisp	Wed Aug 15 15:16:20 2012	(r14095)
@@ -232,8 +232,8 @@
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
           (jvm::emit 'aload 0)
-          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
-          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
+          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
+          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
           (jvm::emit-invokespecial-init jvm::+lisp-primitive+
                                         (list jvm::+lisp-object+
                                               jvm::+lisp-object+))
@@ -241,7 +241,7 @@
       (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-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
           (jvm::emit 'jvm::areturn)))
       (jvm::finalize-class-file file)
       (with-open-stream (stream (sys::%make-byte-array-output-stream))
@@ -260,7 +260,7 @@
       (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)
-          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
+          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
           (jvm::emit-putstatic class "N1" jvm::+lisp-object+)
           (jvm::emit 'return)))
       (let ((method (jvm::make-jvm-method :constructor :void nil)))
@@ -294,8 +294,8 @@
         (jvm::class-add-method file method)
         (jvm::with-code-to-method (file method)
           (jvm::emit 'aload 0)
-          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
-          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-object+)
+          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
+          (jvm::emit-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
           (jvm::emit-invokespecial-init jvm::+lisp-primitive+
                                         (list jvm::+lisp-object+
                                               jvm::+lisp-object+))
@@ -303,7 +303,7 @@
       (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-getstatic jvm::+lisp+ "NIL" jvm::+lisp-symbol+)
           (jvm::emit 'jvm::areturn)))
       (let ((method (jvm::make-jvm-method "execute" jvm::+lisp-object+
                                        (list jvm::+lisp-object+))))
@@ -339,7 +339,8 @@
 	  (jvm::allocate-register :int)
 	  (push jvm::*register* registers))
 	(jvm::allocate-register :int)
-	(push jvm::*register* registers))
+	(push jvm::*register* registers)
+        (jvm::emit 'return))
       (jvm::finalize-class-file file)
       (nreverse registers))
   (1 2 3 4 5))
@@ -365,7 +366,8 @@
 	  (jvm::allocate-register :int)
 	  (push jvm::*register* registers))
 	(jvm::allocate-register :int)
-	(push jvm::*register* registers))
+	(push jvm::*register* registers)
+        (jvm::emit 'return))
       (jvm::finalize-class-file file)
       (nreverse registers))
   (1 1 2 2 3))