From 22d77bd03b355d417d3e94eedfd66e92fb8ff1b2 Mon Sep 17 00:00:00 2001 From: ram <ram> Date: Mon, 5 Mar 1990 11:59:14 +0000 Subject: [PATCH] Fixed merge lossage. Removed FUNCALLABLE-INSTANCE check in LIST branch of OUTPUT-OBJECT, since funcallable instances won't be lists (and haven't been in the current system for quite a while.) --- code/print.lisp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/print.lisp b/code/print.lisp index 95f008d33..9ce5364f9 100644 --- a/code/print.lisp +++ b/code/print.lisp @@ -240,9 +240,7 @@ ;; If a list, go through element by element, being careful ;; about not running over the printlength (list - (if (clos::funcallable-instance-p object) - (clos::print-object object stream (1+ currlevel)) - (output-list object stream (1+ currlevel)))) + (output-list object stream (1+ currlevel))) (string (if *print-escape* (quote-string object stream) @@ -703,6 +701,7 @@ (defun output-structure (structure stream currlevel) (funcall (or (info type printer (svref structure 0)) #'c::default-structure-print) + structure stream currlevel)) ;;;; Functions to help print strings. @@ -1252,7 +1251,7 @@ ;;; Functions Objects and other implmentation specific objects ;;; are output here. -(defun output-random (object) +(defun output-random (object stream) (write-string "#<" stream) (if (compiled-function-p object) (output-function-object object stream) -- GitLab