X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=6ec7f1a3a0fce099c6a92d7452727fdeba899ec6;hb=15db88b169f732c8d339047bfad92e0725d7cacc;hp=7487b14d8939085e7faf1c6ea7e06a865d348560;hpb=08d8d7bccb7642ba4fb54e05fe55c47228951130;p=sbcl.git diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp index 7487b14..6ec7f1a 100644 --- a/src/pcl/boot.lisp +++ b/src/pcl/boot.lisp @@ -313,7 +313,7 @@ bootstrapping. (defun prototypes-for-make-method-lambda (name) (if (not (eq *boot-state* 'complete)) (values nil nil) - (let ((gf? (and (gboundp name) + (let ((gf? (and (fboundp name) (gdefinition name)))) (if (or (null gf?) (not (generic-function-p gf?))) @@ -335,7 +335,7 @@ bootstrapping. ;;; ;;; Note: During bootstrapping, this function is allowed to return NIL. (defun method-prototype-for-gf (name) - (let ((gf? (and (gboundp name) + (let ((gf? (and (fboundp name) (gdefinition name)))) (cond ((neq *boot-state* 'complete) nil) ((or (null gf?) @@ -1359,7 +1359,7 @@ bootstrapping. (defun generic-function-name-p (name) (and (legal-fun-name-p name) - (gboundp name) + (fboundp name) (if (eq *boot-state* 'complete) (standard-generic-function-p (gdefinition name)) (funcallable-instance-p (gdefinition name))))) @@ -1594,7 +1594,7 @@ bootstrapping. &key environment &allow-other-keys) (declare (ignore environment)) - (let ((existing (and (gboundp fun-name) + (let ((existing (and (fboundp fun-name) (gdefinition fun-name)))) (if (and existing (eq *boot-state* 'complete) @@ -1987,9 +1987,9 @@ bootstrapping. (let ((method-class (getf ,all-keys :method-class '.shes-not-there.))) (unless (eq method-class '.shes-not-there.) (setf (getf ,all-keys :method-class) - (cond ((classp method-class) - method-class) - (t (find-class method-class t ,env)))))))) + (cond ((classp method-class) + method-class) + (t (find-class method-class t ,env)))))))) (defun real-ensure-gf-using-class--generic-function (existing @@ -2344,7 +2344,7 @@ bootstrapping. (make-symbol (format nil "~S" method)))) (multiple-value-bind (gf-spec quals specls) (parse-defmethod spec) - (and (setq gf (and (or errorp (gboundp gf-spec)) + (and (setq gf (and (or errorp (fboundp gf-spec)) (gdefinition gf-spec))) (let ((nreq (compute-discriminating-function-arglist-info gf))) (setq specls (append (parse-specializers specls)