Changeset 13231

Timestamp:

Nov 24, 2009, 7:03:02 AM (15 years ago)

Author:

Gary Byers

Message:

If APPLY's last arg is a quoted list, transform it into FUNCALL
(quoting list elements if necessary.)

File:

• trunk/source/compiler/optimizers.lisp (modified) (2 diffs)

trunk/source/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)))))))
+