From: Christophe Rhodes Date: Wed, 28 Jun 2006 10:20:06 +0000 (+0000) Subject: 0.9.14.3: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=230707c1899c1c008f7ce2ad97e2fd04849f7443;p=sbcl.git 0.9.14.3: Merge pprint (cons symbol) change, making it sensitive to the fboundness or otherwise of the symbol in function position. --- diff --git a/NEWS b/NEWS index 8e8829f..3f992c6 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,10 @@ ;;;; -*- coding: utf-8; -*- +changes in sbcl-0.9.15 relative to sbcl-0.9.14: + * minor incompatible change: pretty printing of objects of type + (cons symbol) is, in the default pprint-dispatch-table, now + sensitive to whether the symbol satisfies FBOUNDP. (thanks to + Marcus Pearce) + changes in sbcl-0.9.14 relative to sbcl-0.9.13: * feature: thread support on Solaris/x86, and experimental thread support on OS X/x86. diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp index 7331459..9fb162e 100644 --- a/src/code/pprint.lisp +++ b/src/code/pprint.lisp @@ -1282,9 +1282,13 @@ (defun pprint-fun-call (stream list &rest noise) (declare (ignore noise)) - (funcall (formatter "~:<~^~W~^ ~:_~:I~@{~W~^ ~_~}~:>") + (funcall (formatter "~:<~^~W~^ ~:_~:I~@{~W~^ ~:_~}~:>") stream list)) + +(defun pprint-data-list (stream list &rest noise) + (declare (ignore noise)) + (funcall (formatter "~:<~@{~W~^ ~:_~}~:>") stream list)) ;;;; the interface seen by regular (ugly) printer and initialization routines @@ -1302,8 +1306,10 @@ ;; printers for regular types (/show0 "doing SET-PPRINT-DISPATCH for regular types") (set-pprint-dispatch 'array #'pprint-array) - (set-pprint-dispatch '(cons symbol) + (set-pprint-dispatch '(cons (and symbol (satisfies fboundp))) #'pprint-fun-call -1) + (set-pprint-dispatch '(cons symbol) + #'pprint-data-list -2) (set-pprint-dispatch 'cons #'pprint-fill -2) ;; cons cells with interesting things for the car (/show0 "doing SET-PPRINT-DISPATCH for CONS with interesting CAR") diff --git a/version.lisp-expr b/version.lisp-expr index 496f9bf..2cfc0f5 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.14.2" +"0.9.14.3"