Skip to content

Commit

Permalink
Use PRINT-SYMBOL-WITH-PREFIX from SB-EXT not SB-IMPL
Browse files Browse the repository at this point in the history
Was exported long ago (rev. c7313d0) for this purpose
  • Loading branch information
snuglas committed Sep 12, 2017
1 parent 69c84f9 commit 4f710c8
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 37 deletions.
16 changes: 8 additions & 8 deletions src/code/condition.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@
(:report
(lambda (condition stream)
(format stream "~@<Implicitly creating new generic function ~
~/sb-impl::print-symbol-with-prefix/.~:@>"
~/sb-ext:print-symbol-with-prefix/.~:@>"
(implicit-generic-function-name condition)))))

(define-condition extension-failure (reference-condition simple-error)
Expand Down Expand Up @@ -1167,7 +1167,7 @@ SB-EXT:PACKAGE-LOCKED-ERROR-SYMBOL."))
simple-error)
()
(:default-initargs
:format-control "Symbol ~/sb-impl:print-symbol-with-prefix/ cannot ~
:format-control "Symbol ~/sb-ext:print-symbol-with-prefix/ cannot ~
be both the name of a type and the name of a ~
declaration"
:references '((:ansi-cl :section (3 8 21)))))
Expand Down Expand Up @@ -1253,21 +1253,21 @@ handled by any other handler, it will be muffled.")
(define-condition redefinition-with-defun (function-redefinition-warning)
()
(:report (lambda (warning stream)
(format stream "redefining ~/sb-impl::print-symbol-with-prefix/ ~
(format stream "redefining ~/sb-ext:print-symbol-with-prefix/ ~
in DEFUN"
(redefinition-warning-name warning)))))

(define-condition redefinition-with-defmacro (function-redefinition-warning)
()
(:report (lambda (warning stream)
(format stream "redefining ~/sb-impl::print-symbol-with-prefix/ ~
(format stream "redefining ~/sb-ext:print-symbol-with-prefix/ ~
in DEFMACRO"
(redefinition-warning-name warning)))))

(define-condition redefinition-with-defgeneric (redefinition-warning)
()
(:report (lambda (warning stream)
(format stream "redefining ~/sb-impl::print-symbol-with-prefix/ ~
(format stream "redefining ~/sb-ext:print-symbol-with-prefix/ ~
in DEFGENERIC"
(redefinition-warning-name warning)))))

Expand Down Expand Up @@ -1600,7 +1600,7 @@ conditions."))
;; warm load. (!CALL-A-METHOD does not understand method qualifiers)
(define-deprecation-warning early-deprecation-warning style-warning nil
"~%~@<~:@_In future~@[ ~A~] versions ~
~/sb-impl:print-symbol-with-prefix/ will signal a full warning ~
~/sb-ext:print-symbol-with-prefix/ will signal a full warning ~
at compile-time.~:@>"
"This warning is signaled when the use of a variable,
function, type, etc. in :EARLY deprecation is detected at
Expand All @@ -1609,7 +1609,7 @@ error.")

(define-deprecation-warning late-deprecation-warning warning t
"~%~@<~:@_In future~@[ ~A~] versions ~
~/sb-impl:print-symbol-with-prefix/ will signal a runtime ~
~/sb-ext:print-symbol-with-prefix/ will signal a runtime ~
error.~:@>"
"This warning is signaled when the use of a variable,
function, type, etc. in :LATE deprecation is detected at
Expand All @@ -1618,7 +1618,7 @@ error.")

(define-deprecation-warning final-deprecation-warning warning t
"~%~@<~:@_~*An error will be signaled at runtime for ~
~/sb-impl:print-symbol-with-prefix/.~:@>"
~/sb-ext:print-symbol-with-prefix/.~:@>"
"This warning is signaled when the use of a variable,
function, type, etc. in :FINAL deprecation is detected at
compile-time. An error will be signaled at run-time."))
Expand Down
2 changes: 1 addition & 1 deletion src/code/defstruct.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ unless :NAMED is also specified.")))
;;x#-sb-xc-host
;;x(when (and (fboundp accessor-name)
;;x (not (accessor-inherited-data accessor-name defstruct)))
;;x (style-warn "redefining ~/sb-impl::print-symbol-with-prefix/ ~
;;x (style-warn "redefining ~/sb-ext:print-symbol-with-prefix/ ~
;; in DEFSTRUCT" accessor-name)))
;; which was done until sbcl-0.8.11.18 or so, is wrong: it causes
;; a warning at MACROEXPAND time, when instead the warning should
Expand Down
8 changes: 4 additions & 4 deletions src/code/early-extensions.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1427,11 +1427,11 @@ NOTE: This interface is experimental and subject to change."
;; I don't think this is callable during cross-compilation, is it?
(apply #'format stream
"~#[~;~
Use ~/sb-impl:print-symbol-with-prefix/ instead.~;~
Use ~/sb-impl:print-symbol-with-prefix/ or ~
~/sb-impl:print-symbol-with-prefix/ instead.~:;~
Use ~/sb-ext:print-symbol-with-prefix/ instead.~;~
Use ~/sb-ext:print-symbol-with-prefix/ or ~
~/sb-ext:print-symbol-with-prefix/ instead.~:;~
Use~@{~#[~; or~] ~
~/sb-impl:print-symbol-with-prefix/~^,~} instead.~
~/sb-ext:print-symbol-with-prefix/~^,~} instead.~
~]"
replacements))

Expand Down
2 changes: 1 addition & 1 deletion src/code/ntrace.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
(if (valid-function-name-p x)
(if (fboundp x)
(fdefinition x)
(warn "~/sb-impl::print-symbol-with-prefix/ is ~
(warn "~/sb-ext:print-symbol-with-prefix/ is ~
undefined, not tracing." x))
(warn "~S is not a valid function name, not tracing." x))))
(multiple-value-bind (res named-p)
Expand Down
2 changes: 1 addition & 1 deletion src/code/repack-xref.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
(format t "; Updating most frequently cross-referenced names~%")
(pprint-logical-block (*standard-output* new-names :per-line-prefix "; ")
(format t "~:[no cross references~;~:*~
~{~/sb-impl:print-symbol-with-prefix/~^ ~:_~}~]"
~{~/sb-ext:print-symbol-with-prefix/~^ ~:_~}~]"
(coerce new-names 'list)))
(terpri))
(setf **most-common-xref-names-by-index** (coerce new-names 'vector))
Expand Down
4 changes: 2 additions & 2 deletions src/code/target-package.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ implementation it is ~S." *!default-package-use-list*)
(lambda (c s)
(format s "~@<~S ~S causes name-conflicts in ~S between the ~
following symbols: ~2I~@:_~
~{~/sb-impl::print-symbol-with-prefix/~^, ~}~:@>"
~{~/sb-ext:print-symbol-with-prefix/~^, ~}~:@>"
(name-conflict-function c)
(name-conflict-datum c)
(package-error-package c)
Expand Down Expand Up @@ -1114,7 +1114,7 @@ implementation it is ~S." *!default-package-use-list*)
(*print-pretty* t))
(format *query-io* "~&~@<Select a symbol to be made accessible in ~
package ~A:~2I~@:_~{~{~V,' D. ~
~/sb-impl::print-symbol-with-prefix/~}~@:_~}~
~/sb-ext:print-symbol-with-prefix/~}~@:_~}~
~@:>"
(package-name package)
(loop for s in symbols
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/early-c.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ the stack without triggering overflow protection.")
(style-warn 'asterisks-around-lexical-variable-name
:format-control
"using the lexical binding of the symbol ~
~/sb-impl::print-symbol-with-prefix/, not the~@
~/sb-ext:print-symbol-with-prefix/, not the~@
dynamic binding"
:format-arguments (list symbol)))
(values))
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/ir1tran-lambda.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
(funcall signal-via
#+xc-host "~@<~/sb!impl:print-symbol-with-prefix/ names a ~
~A, and cannot be used in ~A.~:@>"
#-xc-host "~@<~/sb-impl:print-symbol-with-prefix/ names a ~
#-xc-host "~@<~/sb-ext:print-symbol-with-prefix/ names a ~
~A, and cannot be used in ~A.~:@>"
name kind context)))
(let ((kind (info :variable :kind name)))
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/ir2tran.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -2101,7 +2101,7 @@ not stack-allocated LVAR ~S." source-lvar)))))
(when (and (eq kind :unknown)
(sb!impl::package-lock-violation-p (symbol-package symbol) symbol))
(let ((*compiler-error-context* node))
(compiler-warn "violating package lock on ~/sb-impl:print-symbol-with-prefix/"
(compiler-warn "violating package lock on ~/sb-ext:print-symbol-with-prefix/"
symbol))))))

(defoptimizer (restart-point ir2-convert) ((location) node block)
Expand Down
4 changes: 2 additions & 2 deletions src/pcl/boot.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ bootstrapping.
(defun check-method-lambda (method-lambda context)
(unless (typep method-lambda '(cons (eql lambda)))
(error "~@<The METHOD-LAMBDA argument to ~
~/sb-impl:print-symbol-with-prefix/, ~S, is not a lambda ~
~/sb-ext:print-symbol-with-prefix/, ~S, is not a lambda ~
form.~@:>"
context method-lambda))
method-lambda)
Expand Down Expand Up @@ -1982,7 +1982,7 @@ bootstrapping.
(defun generic-clobbers-function (fun-name)
(cerror "Replace the function binding"
'simple-program-error
:format-control "~@<~/sb-impl:print-symbol-with-prefix/ ~
:format-control "~@<~/sb-ext:print-symbol-with-prefix/ ~
already names an ordinary function or a ~
macro.~@:>"
:format-arguments (list fun-name)))
Expand Down
6 changes: 3 additions & 3 deletions src/pcl/cpl.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@
(defun cpl-error (class format-string &rest format-args)
(error "While computing the class precedence list of the class ~A.~%~A"
(if (class-name class)
(format nil "named ~/sb-impl::print-symbol-with-prefix/"
(format nil "named ~/sb-ext:print-symbol-with-prefix/"
(class-name class))
class)
(apply #'format nil format-string format-args)))

(defun cpl-forward-referenced-class-error (class forward-class)
(flet ((class-or-name (class)
(if (class-name class)
(format nil "named ~/sb-impl::print-symbol-with-prefix/"
(format nil "named ~/sb-ext:print-symbol-with-prefix/"
(class-name class))
class)))
(if (eq class forward-class)
Expand Down Expand Up @@ -254,7 +254,7 @@
(flet ((class-or-name (cpd)
(let ((class (cpd-class cpd)))
(if (class-name class)
(format nil "named ~/sb-impl::print-symbol-with-prefix/"
(format nil "named ~/sb-ext:print-symbol-with-prefix/"
(class-name class))
class))))
(mapcar
Expand Down
2 changes: 1 addition & 1 deletion src/pcl/macros.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
((sb-kernel::name :type (satisfies legal-class-name-p)))
(:report (lambda (condition stream)
(format stream "~@<There is no class named ~
~/sb-impl:print-symbol-with-prefix/.~@:>"
~/sb-ext:print-symbol-with-prefix/.~@:>"
(sb-kernel::cell-error-name condition)))))

(eval-when (:compile-toplevel :load-toplevel :execute)
Expand Down
6 changes: 3 additions & 3 deletions src/pcl/print-object.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
(print-unreadable-object (method stream :type t :identity t)
(let ((generic-function (method-generic-function method))
(*print-length* 50))
(format stream "~:[~*~;~/sb-impl::print-symbol-with-prefix/ ~]~{~S ~}~:S"
(format stream "~:[~*~;~/sb-ext:print-symbol-with-prefix/ ~]~{~S ~}~:S"
generic-function
(and generic-function
(generic-function-name generic-function))
Expand All @@ -69,7 +69,7 @@
(if (slot-boundp method '%generic-function)
(print-unreadable-object (method stream :type t :identity t)
(let ((generic-function (method-generic-function method)))
(format stream "~/sb-impl::print-symbol-with-prefix/, slot:~S, ~:S"
(format stream "~/sb-ext:print-symbol-with-prefix/, slot:~S, ~:S"
(and generic-function
(generic-function-name generic-function))
(accessor-method-slot-name method)
Expand All @@ -91,7 +91,7 @@
(let ((name (slot-value instance 'name)))
(print-unreadable-object
(instance stream :type t :identity (not properly-named-p))
(format stream "~/sb-impl::print-symbol-with-prefix/~:[~:; ~:S~]"
(format stream "~/sb-ext:print-symbol-with-prefix/~:[~:; ~:S~]"
name extra-p extra))))
((not extra-p) ; case (2): empty body to avoid an extra space
(print-unreadable-object (instance stream :type t :identity t)))
Expand Down
4 changes: 2 additions & 2 deletions src/pcl/sequence.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
(let ((operation (sequence::protocol-unimplemented-operation condition))
(datum (type-error-datum condition)))
(format stream "~@<The operation ~
~/sb-impl:print-symbol-with-prefix/ is not ~
~/sb-ext:print-symbol-with-prefix/ is not ~
implemented for ~A which is an instance of the ~
~/sb-impl:print-symbol-with-prefix/ subclass ~
~/sb-ext:print-symbol-with-prefix/ subclass ~
~S.~@:>"
operation datum 'sequence (class-of datum)))))
(:documentation
Expand Down
8 changes: 4 additions & 4 deletions src/pcl/std-class.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
(cond
((eq class-or-name name)
(error "~@<Class named ~
~/sb-impl::print-symbol-with-prefix/ ~
~/sb-ext:print-symbol-with-prefix/ ~
specified as its own ~(~A~)class.~@:>"
class-or-name which))
((find-class class-or-name (eq which :meta)))
Expand Down Expand Up @@ -1031,7 +1031,7 @@
(style-warn
"~@<slot names with the same SYMBOL-NAME but ~
different SYMBOL-PACKAGE (possible package problem) ~
for class ~S:~4I~@:_~<~@{~/sb-impl::print-symbol-with-prefix/~^~:@_~}~:>~@:>"
for class ~S:~4I~@:_~<~@{~/sb-ext:print-symbol-with-prefix/~^~:@_~}~:>~@:>"
class dupes)))
(let* ((slot-name (slot-definition-name (car slots)))
(oslots (and (not (eq (symbol-package slot-name)
Expand Down Expand Up @@ -1489,7 +1489,7 @@
(restart-case
(bad-type value slot-type
"~@<Error during ~A. Current value in slot ~
~/sb-impl::print-symbol-with-prefix/ of an instance ~
~/sb-ext:print-symbol-with-prefix/ of an instance ~
of ~S is ~S, which does not match the new slot type ~
~S in class ~S.~:@>"
context slot-name old-class value slot-type new-class)
Expand All @@ -1498,7 +1498,7 @@
:report (lambda (stream)
(format stream "~@<Specify a new value to by used ~
for slot ~
~/sb-impl::print-symbol-with-prefix/ ~
~/sb-ext:print-symbol-with-prefix/ ~
instead of ~S.~@:>"
slot-name value))
(setf value new-value))))
Expand Down
2 changes: 1 addition & 1 deletion tests/test-util.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
(declare (ignore warnings-p))
(labels ((fail (kind conditions &optional allowed-type)
(error "~@<Compilation of ~S signaled ~A~P:~
~{~@:_~@:_~{~/sb-impl:print-symbol-with-prefix/: ~A~}~}~
~{~@:_~@:_~{~/sb-ext:print-symbol-with-prefix/: ~A~}~}~
~@[~@:_~@:_Allowed type is ~S.~]~@:>"
form kind (length conditions)
(mapcar (lambda (condition)
Expand Down
2 changes: 1 addition & 1 deletion tools-for-build/pending-deprecations.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
(function :function)
(variable :variable)
(type :type)))))
(format t "- ~8A ~/sb-impl::print-symbol-with-prefix/~56T~
(format t "- ~8A ~/sb-ext:print-symbol-with-prefix/~56T~
~9@A/~:[??????????~:;~:*~/cl-user::print-universal-time/~] ~
~6A ~
-> ~6A ~:[??????????~:;~:*~/cl-user::print-universal-time/~]~%~
Expand Down

0 comments on commit 4f710c8

Please sign in to comment.