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

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Dec 29 21:26:28 2008
New Revision: 11508

Log:
Cleanup: `, -> (nothing); (EMIT 'LABEL ...) -> (LABEL ...)

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	Mon Dec 29 21:26:28 2008
@@ -568,18 +568,18 @@
     (aload (compiland-argument-register *current-compiland*))
     (emit 'arraylength)
     (emit-push-constant-int arity)
-    (emit 'if_icmpeq `,label1)
+    (emit 'if_icmpeq label1)
     (aload 0) ; this
     (emit-invokevirtual *this-class* "argCountError" nil nil)
-    (emit 'label `,label1)))
+    (label label1)))
 
 (defun maybe-generate-interrupt-check ()
   (unless (> *speed* *safety*)
     (let ((label1 (gensym)))
       (emit 'getstatic +lisp-class+ "interrupted" "Z")
-      (emit 'ifeq `,label1)
+      (emit 'ifeq label1)
       (emit-invokestatic +lisp-class+ "handleInterrupt" nil nil)
-      (emit 'label `,label1))))
+      (label label1))))
 
 (defknown single-valued-p (t) t)
 (defun single-valued-p (form)
@@ -2411,12 +2411,12 @@
 					       arg2 'stack nil)
      (let ((LABEL1 (gensym))
            (LABEL2 (gensym)))
-       (emit (if (eq op 'EQ) 'if_acmpne 'if_acmpeq) `,LABEL1)
+       (emit (if (eq op 'EQ) 'if_acmpne 'if_acmpeq) LABEL1)
        (emit-push-true representation)
-       (emit 'goto `,LABEL2)
-       (label `,LABEL1)
+       (emit 'goto LABEL2)
+       (label LABEL1)
        (emit-push-false representation)
-       (label `,LABEL2))
+       (label LABEL2))
      (emit-move-from-stack target representation))
    t)
 
@@ -2430,9 +2430,9 @@
        (emit 'ifne label1)
        (emit-push-nil)
        (emit 'goto label2)
-       (emit 'label label1)
+       (label label1)
        (emit-push-t)
-       (emit 'label label2)))))
+       (label label2)))))
 
 (defknown p2-eql (t t t) t)
 (defun p2-eql (form target representation)
@@ -2450,12 +2450,12 @@
 						      arg2 'stack :int)
            (let ((label1 (gensym))
                  (label2 (gensym)))
-             (emit 'if_icmpeq `,label1)
+             (emit 'if_icmpeq label1)
              (emit-push-false representation)
-             (emit 'goto `,label2)
-             (emit 'label `,label1)
+             (emit 'goto label2)
+             (label label1)
              (emit-push-true representation)
-             (emit 'label `,label2)))
+             (label label2)))
           ((fixnum-type-p type2)
 	   (compile-forms-and-maybe-emit-clear-values arg1 'stack nil
 						      arg2 'stack :int)
@@ -7321,9 +7321,9 @@
              (emit 'if_acmpeq LABEL1)
              (emit-push-true representation)
              (emit 'goto LABEL2)
-             (emit 'label LABEL1)
+             (label LABEL1)
              (emit-push-false representation)
-             (emit 'label LABEL2)))
+             (label LABEL2)))
           ((eq representation :boolean)
 	   (compile-forms-and-maybe-emit-clear-values arg 'stack :boolean)
            (emit 'iconst_1)
@@ -7335,9 +7335,9 @@
              (emit 'ifeq LABEL1)
              (emit-push-nil)
              (emit 'goto LABEL2)
-             (emit 'label LABEL1)
+             (label LABEL1)
              (emit-push-t)
-             (emit 'label LABEL2)))
+             (label LABEL2)))
           (t
 	   (compile-forms-and-maybe-emit-clear-values arg 'stack nil)
            (let ((LABEL1 (gensym))
@@ -7346,9 +7346,9 @@
              (emit 'if_acmpeq LABEL1)
              (emit-push-nil)
              (emit 'goto LABEL2)
-             (emit 'label LABEL1)
+             (label LABEL1)
              (emit-push-t)
-             (emit 'label LABEL2)))))
+             (label LABEL2)))))
   (emit-move-from-stack target representation))
 
 (defun p2-nthcdr (form target representation)
@@ -7423,9 +7423,9 @@
          (emit 'pop)
          (compile-form arg2 'stack representation)
          (emit 'goto LABEL2)
-         (emit 'label LABEL1)
+         (label LABEL1)
          (fix-boxing representation nil) ; FIXME use derived result type
-         (emit 'label LABEL2)
+         (label LABEL2)
          (emit-move-from-stack target representation)))
       (t
        ;; (or a b c d e f) => (or a (or b c d e f))