From a2654b563a79a7015a39d43a7a7709a538868765 Mon Sep 17 00:00:00 2001 From: Alastair Bridgewater Date: Thu, 31 Mar 2011 16:07:19 -0400 Subject: [PATCH] setf: excise GET-SETF-METHOD and related detritus. * GET-SETF-METHOD is the CLtL1 version of GET-SETF-EXPANSION, and is neither used in SBCL nor exported from any package. Kill it. * Also kill the DEFKNOWN in the compiler for a (different) GET-SETF-METHOD and GET-SETF-METHOD-MULTIPLE-VALUE (also a CLtL1 function, neither used nor implemented in SBCL). --- src/code/early-setf.lisp | 19 ------------------- src/compiler/fndb.lisp | 4 ---- 2 files changed, 23 deletions(-) diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp index e3884e3..91808a0 100644 --- a/src/code/early-setf.lisp +++ b/src/code/early-setf.lisp @@ -70,25 +70,6 @@ (t (expand-or-get-setf-inverse form environment))))) -;;; GET-SETF-METHOD existed in pre-ANSI Common Lisp, and various code inherited -;;; from CMU CL uses it repeatedly, so rather than rewrite a lot of code to not -;;; use it, we just define it in terms of ANSI's GET-SETF-EXPANSION (or -;;; actually, the cross-compiler version of that, i.e. -;;; SB!XC:GET-SETF-EXPANSION). -(declaim (ftype (function (t &optional (or null sb!c::lexenv))) get-setf-method)) -(defun get-setf-method (form &optional environment) - #!+sb-doc - "This is a specialized-for-one-value version of GET-SETF-EXPANSION (and -a relic from pre-ANSI Common Lisp). Portable ANSI code should use -GET-SETF-EXPANSION directly." - (multiple-value-bind (temps value-forms store-vars store-form access-form) - (sb!xc:get-setf-expansion form environment) - (when (cdr store-vars) - (error "GET-SETF-METHOD used for a form with multiple store ~ - variables:~% ~S" - form)) - (values temps value-forms store-vars store-form access-form))) - ;;; If a macro, expand one level and try again. If not, go for the ;;; SETF function. (declaim (ftype (function (t (or null sb!c::lexenv))) diff --git a/src/compiler/fndb.lisp b/src/compiler/fndb.lisp index edb99d4..2a2716c 100644 --- a/src/compiler/fndb.lisp +++ b/src/compiler/fndb.lisp @@ -114,10 +114,6 @@ (defknown makunbound (symbol) symbol) (defknown fmakunbound ((or symbol cons)) (or symbol cons) (unsafe explicit-check)) -(defknown (get-setf-method get-setf-method-multiple-value) - ((or list symbol) &optional lexenv-designator) - (values list list list form form) - (flushable)) (defknown apply (callable t &rest t) *) ; ### Last arg must be List... (defknown funcall (callable &rest t) *) -- 1.7.10.4