Skip to content

Use <= for three argument ~^ #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kg583 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use <= for three argument ~^ #536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/format.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ and (nthcdr *format-arguments-variance* *format-arguments*)")
(real
(<= p1 p2 p3))
(character
(char< p1 p2 p3))))
(char<= p1 p2 p3))))
(p2 (equal p1 p2))
(p1 (eql p1 0))
(t (null (if colon *format-colon-rest* *format-arguments*))))
Expand Down Expand Up @@ -2442,9 +2442,9 @@ and (nthcdr *format-arguments-variance* *format-arguments*)")
(if (every (lambda (p) (nx-could-be-type p 'real)) parms)
;; If the params could also be chars, don't know enough to constant fold
;; anyway, so this test will do.
`(< ,p1 ,p2 ,p3)
`(<= ,p1 ,p2 ,p3)
(if (every (lambda (p) (nx-could-be-type p 'character)) parms)
`(char< ,p1 ,p2 ,p3)
`(char<= ,p1 ,p2 ,p3)
;; At least one can't be real, at least one can't be char.
(format-error "Wrong type of parameters for three-way comparison"))))
(p2 `(equal ,p1 ,p2))
Expand Down