X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=f5428786c00f5bac79d83a541258fc2293f1482b;hb=7acdf15e27993655c9249f79d36fe2117843dbdf;hp=f499bfb68537c5a27b4c1dde472cb9beab2d8687;hpb=628c9c353690b012965ccd74d68e1b81e4a2a368;p=sbcl.git diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp index f499bfb..f542878 100644 --- a/src/code/pprint.lisp +++ b/src/code/pprint.lisp @@ -1142,7 +1142,8 @@ line break." (consp (cdr list)) (cddr list) ;; Filter out (FLET FOO :IN BAR) names. - (not (eq :in (third list)))) + (and (consp (cddr list)) + (not (eq :in (third list))))) (funcall (formatter "~:<~^~W~^ ~@_~:<~@{~:<~^~W~^~3I ~:_~/SB!PRETTY:PPRINT-LAMBDA-LIST/~1I~:@_~@{~W~^ ~_~}~:>~^ ~_~}~:>~1I~@:_~@{~W~^ ~_~}~:>") stream @@ -1266,7 +1267,9 @@ line break." (defun pprint-defmethod (stream list &rest noise) (declare (ignore noise)) - (if (consp (third list)) + (if (and (consp (cdr list)) + (consp (cddr list)) + (consp (third list))) (pprint-defun stream list) (funcall (formatter "~:<~^~W~^ ~@_~:I~W~^ ~W~^ ~:_~/SB!PRETTY:PPRINT-LAMBDA-LIST/~1I~@{ ~_~W~}~:>") @@ -1373,7 +1376,7 @@ line break." (declare (ignore noise)) (destructuring-bind (loop-symbol . clauses) list (declare (ignore loop-symbol)) - (if (or (null clauses) (consp (car clauses))) + (if (or (atom clauses) (consp (car clauses))) (pprint-spread-fun-call stream list) (pprint-extended-loop stream list))))