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

[Ville Voutilainen]

Author: vvoutilainen
Date: Sun May 17 09:16:37 2009
New Revision: 11890

Log:
Don't repeat class names in p2-compiland, convert cond to if.


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	Sun May 17 09:16:37 2009
@@ -8196,10 +8196,10 @@
     (setf (method-handlers execute-method) (nreverse *handlers*))
 
     (setf (class-file-superclass class-file)
-          (cond
-            ((and *child-p* *closure-variables*) +lisp-compiled-closure-class+)
-            (*hairy-arglist-p* +lisp-compiled-closure-class+)
-            (t +lisp-primitive-class+)))
+          (if (or *hairy-arglist-p*
+		  (and *child-p* *closure-variables*))
+	      +lisp-compiled-closure-class+
+	    +lisp-primitive-class+))
 
     (setf (class-file-lambda-list class-file) args)