From: Jan M. <sc...@us...> - 2015-03-02 00:07:21
|
The branch "master" has been updated in SBCL: via f7137b637701578d9e2f301829e1ba3e4137cedb (commit) from c07f580a19596c3b81561e684ccfb252f7923964 (commit) - Log ----------------------------------------------------------------- commit f7137b637701578d9e2f301829e1ba3e4137cedb Author: Jan Moringen <jmo...@te...> Date: Sun Mar 1 20:20:43 2015 +0100 Fix build with CLL and CLisp hosts Commit 307d72de changed format strings for deprecation reports to use PRINT-SYMBOL-WITH-PREFIX via ~/sb-impl:print-symbol-with-prefix/ but should have used ~/sb!impl:print-symbol-with-prefix/ in the sb-xc-host case. --- src/code/early-extensions.lisp | 44 +++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/code/early-extensions.lisp b/src/code/early-extensions.lisp index 1e621cd..f656f54 100644 --- a/src/code/early-extensions.lisp +++ b/src/code/early-extensions.lisp @@ -1197,6 +1197,30 @@ (deftype deprecation-state () '(member :early :late :final)) +(defun print-deprecation-message (name since &optional replacements stream) + (apply #'format stream + #+sb-xc-host + "~/sb!impl:print-symbol-with-prefix/ has been ~ + deprecated as of SBCL ~A.~ + ~#[~;~ + ~2%Use ~/sb!impl:print-symbol-with-prefix/ instead.~;~ + ~2%Use ~/sb!impl:print-symbol-with-prefix/ or ~ + /sb!impl:print-symbol-with-prefix/ instead.~:;~ + ~2%Use~@{~#[~; or~] ~ + ~/sb!impl:print-symbol-with-prefix/~^,~} instead.~ + ~]" + #-sb-xc-host + "~/sb-impl:print-symbol-with-prefix/ has been ~ + deprecated as of SBCL ~A.~ + ~#[~;~ + ~2%Use ~/sb-impl:print-symbol-with-prefix/ instead.~;~ + ~2%Use ~/sb-impl:print-symbol-with-prefix/ or ~ + /sb-impl:print-symbol-with-prefix/ instead.~:;~ + ~2%Use~@{~#[~; or~] ~ + ~/sb-impl:print-symbol-with-prefix/~^,~} instead.~ + ~]" + name since replacements)) + (defmacro define-deprecated-function (state since name replacements lambda-list &body body) (declare (type deprecation-state state) @@ -1205,19 +1229,7 @@ (type (or function-name list) replacements) (type list lambda-list)) (let* ((replacements (normalize-deprecation-replacements replacements)) - #!+sb-doc - (doc - (apply #'format nil - "~/sb-impl:print-symbol-with-prefix/ has been ~ - deprecated as of SBCL ~A.~ - ~#[~;~ - ~2%Use ~/sb-impl:print-symbol-with-prefix/ instead.~;~ - ~2%Use ~/sb-impl:print-symbol-with-prefix/ or ~ - /sb-impl:print-symbol-with-prefix/ instead.~:;~ - ~2%Use~@{~#[~; or~] ~ - ~/sb-impl:print-symbol-with-prefix/~^,~} instead.~ - ~]" - name since replacements))) + (doc (print-deprecation-message name since replacements))) `(prog1 ,(ecase state ((:early :late) @@ -1255,11 +1267,7 @@ `',name) #!+sb-doc (setf (fdocumentation ',name 'variable) - ,(format nil "~@<~/sb-impl:print-symbol-with-prefix/ has ~ - been deprecated as of SBCL ~A.~@[~2% Use ~ - ~/sb-impl:print-symbol-with-prefix/ ~ - instead~].~:>" - name since replacement)))) + ,(print-deprecation-message name since (list replacement))))) ;;; Anaphoric macros (defmacro awhen (test &body body) ----------------------------------------------------------------------- hooks/post-receive -- SBCL |