Changeset 13331

Timestamp:

Dec 22, 2009, 2:23:44 PM (15 years ago)

Author:

gz

Message:

Transform APPLY with constant arg into FUNCALL (r13231 from trunk)

Location:

branches/working-0711/ccl

Files:

• . (modified) (1 prop)
• compiler/optimizers.lisp (modified) (2 diffs)

branches/working-0711/ccl/compiler/optimizers.lisp

@@ -327 +327 @@
       call)))
 
+
 (define-compiler-macro apply  (&whole call fn arg0 &rest args)
   ;; Special-case (apply #'make-instance 'name ...)
@@ -362 +363 @@
                    original-fn
                    (nreconc (cdr (reverse args)) (%cdr last))))
-            call))))))
+            (if (and (consp last)
+                     (eq (car last) 'quote)
+                     (proper-list-p (cadr last)))
+              (flet ((quotify (arg)
+                       (if (self-evaluating-p arg)
+                         arg
+                         (list 'quote arg))))
+                (cons 'funcall (cons original-fn
+                                     (nreconc (cdr (reverse args)) (mapcar #'quotify (%cadr last))))))
+              call)))))))
+