[armedbear-cvs] r11517 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Tue Dec 30 20:31:30 2008
New Revision: 11517

Log:
Replace Java type indicator with pre-existing constant with the same purpose.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Tue Dec 30 20:31:30 2008
@@ -1098,7 +1098,7 @@
                    (inst 'aload *thread*)
                    (inst 'aconst_null)
                    (inst 'putfield (list +lisp-thread-class+ "_values"
-                                         "[Lorg/armedbear/lisp/LispObject;")))))
+                                         +lisp-object-array+)))))
              (dolist (instruction instructions)
                (vector-push-extend (resolve-instruction instruction) vector))))
           (t
@@ -3709,14 +3709,14 @@
     (compile-form first-subform result-register nil)
     ;; Save multiple values returned by first subform.
     (emit-push-current-thread)
-    (emit 'getfield +lisp-thread-class+ "_values" "[Lorg/armedbear/lisp/LispObject;")
+    (emit 'getfield +lisp-thread-class+ "_values" +lisp-object-array+)
     (astore values-register)
     (dolist (subform subforms)
       (compile-form subform nil nil))
     ;; Restore multiple values returned by first subform.
     (emit-push-current-thread)
     (aload values-register)
-    (emit 'putfield +lisp-thread-class+ "_values" "[Lorg/armedbear/lisp/LispObject;")
+    (emit 'putfield +lisp-thread-class+ "_values" +lisp-object-array+)
     ;; Result.
     (aload result-register)
     (fix-boxing representation nil)
@@ -3873,7 +3873,7 @@
              (compile-form (third form) result-register nil)
              ;; Store values from values form in values register.
              (emit-push-current-thread)
-             (emit 'getfield +lisp-thread-class+ "_values" "[Lorg/armedbear/lisp/LispObject;")
+             (emit 'getfield +lisp-thread-class+ "_values" +lisp-object-array+)
              (emit-move-from-stack values-register)
              ;; Did we get just one value?
              (aload values-register)
@@ -8114,7 +8114,7 @@
         (label BEGIN-PROTECTED-RANGE)
         (compile-form protected-form result-register nil)
         (emit-push-current-thread)
-        (emit 'getfield +lisp-thread-class+ "_values" "[Lorg/armedbear/lisp/LispObject;")
+        (emit 'getfield +lisp-thread-class+ "_values" +lisp-object-array+)
         (astore values-register)
         (label END-PROTECTED-RANGE))
       (emit 'jsr CLEANUP)
@@ -8136,7 +8136,7 @@
       ;; Restore multiple values returned by protected form.
       (emit-push-current-thread)
       (aload values-register)
-      (emit 'putfield +lisp-thread-class+ "_values" "[Lorg/armedbear/lisp/LispObject;")
+      (emit 'putfield +lisp-thread-class+ "_values" +lisp-object-array+)
       ;; Result.
       (aload result-register)
       (emit-move-from-stack target)