Changeset 14095

Timestamp:

08/15/12 22:16:20 (9 years ago)

Author:

ehuelsmann

Message:

Fix test failures by fixing test incorrectnesses.

File:

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

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

@@ -233 +233 @@
         (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+
@@ -242 +242 @@
         (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)
@@ -261 +261 @@
         (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)))
@@ -295 +295 @@
         (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+
@@ -304 +304 @@
         (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+
@@ -340 +340 @@
     (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))
@@ -366 +367 @@
     (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))