Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Carl Shapiro
cmucl
Commits
cf719fdd
Commit
cf719fdd
authored
27 years ago
by
dtc
Browse files
Options
Downloads
Patches
Plain Diff
Fix a few cases where the pretty printer was failing to respect
*print-readably* when using *print-length* and *print-lines*.
parent
ad0ba111
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
code/pprint.lisp
+6
-4
6 additions, 4 deletions
code/pprint.lisp
with
6 additions
and
4 deletions
code/pprint.lisp
+
6
−
4
View file @
cf719fdd
...
...
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.2
2
199
4/12/02 23:27:41 ram
Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.2
3
199
8/02/24 17:36:10 dtc
Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -568,7 +568,7 @@
(
defun
fits-on-line-p
(
stream
until
force-newlines-p
)
(
let
((
available
(
pretty-stream-line-length
stream
)))
(
when
(
and
*print-lines*
(
when
(
and
(
not
*print-readably*
)
*print-lines*
(
=
*print-lines*
(
pretty-stream-line-number
stream
)))
(
decf
available
3
)
; for the `` ..''
(
decf
available
(
logical-block-suffix-length
...
...
@@ -602,7 +602,8 @@
(
write-string
buffer
target
:end
amount-to-print
)
(
let
((
line-number
(
pretty-stream-line-number
stream
)))
(
incf
line-number
)
(
when
(
and
*print-lines*
(
>=
line-number
*print-lines*
))
(
when
(
and
(
not
*print-readably*
)
*print-lines*
(
>=
line-number
*print-lines*
))
(
write-string
" .."
target
)
(
let
((
suffix-length
(
logical-block-suffix-length
(
car
(
pretty-stream-blocks
stream
)))))
...
...
@@ -730,7 +731,8 @@
(
write-string
". "
,
stream-var
)
(
output-object
,
object-var
,
stream-var
)
(
return-from
,
block-name
nil
))))
(
when
(
eql
,
count-name
*print-length*
)
(
when
(
and
(
not
*print-readably*
)
(
eql
,
count-name
*print-length*
))
(
write-string
"..."
,
stream-var
)
(
return-from
,
block-name
nil
))
,@
(
when
object
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment