X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmacros.lisp;h=764c14c2b24c33016bd2a78d900c3de7579ae998;hb=d147d512602d761a2dcdfded506dd1a8f9a140dc;hp=dcb5df598b775917a31b00a26c22531ae45cbbac;hpb=26b8ddda97fcfa2e2c0eae3bd2fdb19717c5fa40;p=sbcl.git diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp index dcb5df5..764c14c 100644 --- a/src/pcl/macros.lisp +++ b/src/pcl/macros.lisp @@ -37,18 +37,6 @@ ;; information around, I'm not sure. -- WHN 2000-12-30 %variable-rebinding)) -(defmacro name-get-fdefinition (name) - (sb-int:once-only ((name name)) - `(if (symbolp ,name) ; take care of "setf "'s - (symbol-function ,name) - (fdefinition ,name)))) - -(defmacro name-set-fdefinition (name new-definition) - (sb-int:once-only ((name name)) - `(if (symbolp ,name) ; take care of "setf "'s - (setf (symbol-function ,name) ,new-definition) - (setf (fdefinition ,name) ,new-definition)))) - ;;; FIXME: CONSTANTLY-FOO should be boosted up to SB-INT too. (macrolet ((def-constantly-fun (name constant-expr) `(setf (symbol-function ',name) @@ -75,7 +63,7 @@ (loop (cond ((not (listp form)) (return-from outer nil)) ((eq (car form) 'declare) - (return-from inner 't)) + (return-from inner t)) (t (multiple-value-bind (newform macrop) (macroexpand-1 form environment) @@ -230,10 +218,11 @@ (eq *boot-state* 'braid)) (when (and new-value (class-wrapper new-value)) (setf (find-class-cell-predicate cell) - (name-get-fdefinition (class-predicate-name new-value)))) + (fdefinition (class-predicate-name new-value)))) (when (and new-value (not (forward-referenced-class-p new-value))) - (dolist (keys+aok (find-class-cell-make-instance-function-keys cell)) + (dolist (keys+aok (find-class-cell-make-instance-function-keys + cell)) (update-initialize-info-internal (initialize-info new-value (car keys+aok) nil (cdr keys+aok)) 'make-instance-function)))) @@ -267,8 +256,8 @@ value))) #'(lambda () result)))) -;;; These are augmented definitions of list-elements and list-tails from -;;; iterate.lisp. These versions provide the extra :by keyword which can +;;; These are augmented definitions of LIST-ELEMENTS and LIST-TAILS from +;;; iterate.lisp. These versions provide the extra :BY keyword which can ;;; be used to specify the step function through the list. (defmacro *list-elements (list &key (by #'cdr)) `(let ((tail ,list))