Changeset 11868

Timestamp:

05/15/09 10:20:09 (14 years ago)

Author:

ehuelsmann

Message:

Replace string literals with constants.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (10 diffs)

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

@@ -200 +200 @@
 
 (defconstant +java-string+ "Ljava/lang/String;")
+(defconstant +java-object+ "Ljava/lang/Object;")
 (defconstant +lisp-class+ "org/armedbear/lisp/Lisp")
 (defconstant +lisp-nil-class+ "org/armedbear/lisp/Nil")
@@ -207 +208 @@
 (defconstant +lisp-object-array+ "[Lorg/armedbear/lisp/LispObject;")
 (defconstant +closure-binding-array+ "[Lorg/armedbear/lisp/ClosureBinding;")
-(defconstant +closure-binding+ "Lorg/armedbear/lisp/ClosureBinding;")
 (defconstant +closure-binding-class+ "org/armedbear/lisp/ClosureBinding")
 (defconstant +lisp-symbol-class+ "org/armedbear/lisp/Symbol")
@@ -2999 +2999 @@
     (emit-push-constant-int 0)                            ;; srcPos
     (emit-push-constant-int (length *closure-variables*))
-    (emit 'anewarray "org/armedbear/lisp/ClosureBinding")     ;; dest
+    (emit 'anewarray +closure-binding-class+)             ;; dest
     (emit 'dup)
     (astore register)  ;; save dest value
@@ -3005 +3005 @@
     (emit-push-constant-int (length *closure-variables*)) ;; length
     (emit-invokestatic "java/lang/System" "arraycopy"
-                       (list "Ljava/lang/Object;" "I"
-                             "Ljava/lang/Object;" "I" "I") nil)
+                       (list +java-object+ "I"
+                             +java-object+ "I" "I") nil)
     (aload register))) ;; reload dest value
 
@@ -3898 +3898 @@
                              (list +lisp-symbol+ +lisp-object+) nil))
         ((variable-closure-index variable)              ;; stack:
-         (emit 'new "org/armedbear/lisp/ClosureBinding") ;; value c-b
-         (emit 'dup_x1)                                  ;; c-b value c-b
-         (emit 'swap)                                    ;; c-b c-b value
-         (emit-invokespecial-init "org/armedbear/lisp/ClosureBinding"
-                                 (list +lisp-object+))   ;; c-b
+         (emit 'new +closure-binding-class+)            ;; value c-b
+         (emit 'dup_x1)                                 ;; c-b value c-b
+         (emit 'swap)                                   ;; c-b c-b value
+         (emit-invokespecial-init +closure-binding-class+
+                                  (list +lisp-object+)) ;; c-b
          (aload (compiland-closure-register *current-compiland*))
                                                          ;; c-b array
@@ -4184 +4184 @@
              (emit 'aaload)
              (emit-swap representation nil)
-             (emit 'putfield "org/armedbear/lisp/ClosureBinding" "value"
-                   "Lorg/armedbear/lisp/LispObject;"))
+             (emit 'putfield +closure-binding-class+ "value" +lisp-object+))
             (t
              ;;###FIXME: We might want to address the "temp-register" case too.
@@ -4216 +4215 @@
            (emit-push-constant-int (variable-closure-index variable))
            (emit 'aaload)
-           (emit 'getfield "org/armedbear/lisp/ClosureBinding" "value"
-                 "Lorg/armedbear/lisp/LispObject;"))
+           (emit 'getfield +closure-binding-class+ "value" +lisp-object+))
           (t ;;###FIXME: We might want to address the "temp-register" case too.
            (assert nil)))))
@@ -8090 +8088 @@
          ;; if we're the ultimate parent: create the closure array
          (emit-push-constant-int (length *closure-variables*))
-         (emit 'anewarray "org/armedbear/lisp/ClosureBinding"))
+         (emit 'anewarray +closure-binding-class+))
         (local-closure-vars
          (duplicate-closure-array compiland))))
@@ -8111 +8109 @@
             (emit 'dup) ; array
             (emit-push-constant-int i)
-            (emit 'new "org/armedbear/lisp/ClosureBinding")
+            (emit 'new +closure-binding-class+)
             (emit 'dup)
             (cond
@@ -8129 +8127 @@
               (t
                (assert (not "Can't happen!!"))))
-            (emit-invokespecial-init "org/armedbear/lisp/ClosureBinding"
+            (emit-invokespecial-init +closure-binding-class+
                                      (list +lisp-object+))
             (emit 'aastore)))))