From 2cacf0aefc8737216d100a4d7404453db5ddfc3e Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Mon, 28 Jun 2010 21:37:07 +0200 Subject: [PATCH] Simplifications in compiler macro for TYPEP --- src/cmp/cmpopt.lsp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cmp/cmpopt.lsp b/src/cmp/cmpopt.lsp index 53a1d5f9c..15f4d2661 100644 --- a/src/cmp/cmpopt.lsp +++ b/src/cmp/cmpopt.lsp @@ -86,8 +86,7 @@ ;; ;; Complex types defined with DEFTYPE. ((and (atom type) - (get-sysprop type 'SI::DEFTYPE-DEFINITION) - (setq function (get-sysprop type 'SI::DEFTYPE-DEFINITION))) + (setq function (get-sysprop type 'SI::DEFTYPE-DEFINITION))) (expand-typep form object `',(funcall function) env)) ;; ;; No optimizations that take up too much space unless requested. @@ -143,8 +142,8 @@ ;; (SATISFIES predicate) ((and (eq first 'SATISFIES) (= (list-length type) 2) - (symbolp (second type))) - `(function ,object)) + (symbolp (setf function (second type)))) + `(,function ,object)) ;; ;; Complex types with arguments. ((setf rest (rest type)