me/guix
Archived
1
0
Fork 0
Code Activity

read-print: Correctly read "(. x)".

Browse source 
* guix/read-print.scm (read-with-comments): Check whether REST is a pair
before calling 'set-cdr!'.
* tests/read-print.scm ("read-with-comments: half dot notation"): New test.
This commit is contained in:
Ludovic Courtès 2023-05-05 18:22:56 +02:00
parent 94d0efffb3
commit 8749f31485
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/read-print.scm
View file

@ -179,9 +179,11 @@ BLANK-LINE? is true, assume PORT is at the beginning of a new line."
(match lst (match lst
(() result) (() result)
(((? dot?) . rest) (((? dot?) . rest)
(if (pair? rest)
(let ((dotted (reverse rest))) (let ((dotted (reverse rest)))
(set-cdr! (last-pair dotted) (car result)) (set-cdr! (last-pair dotted) (car result))
dotted)) dotted)
(car result)))
((x . rest) (loop (cons x result) rest))))) ((x . rest) (loop (cons x result) rest)))))
(let loop ((blank-line? blank-line?) (let loop ((blank-line? blank-line?)

5
tests/read-print.scm
View file

@ -58,6 +58,11 @@ expressions."
(call-with-input-string "(a . b)" (call-with-input-string "(a . b)"
read-with-comments)) read-with-comments))
(test-equal "read-with-comments: half dot notation"
'(lambda x x)
(call-with-input-string "(lambda (. x) x)"
read-with-comments))
(test-equal "read-with-comments: list with blank line" (test-equal "read-with-comments: list with blank line"
`(list with ,(vertical-space 1) blank line) `(list with ,(vertical-space 1) blank line)
(call-with-input-string "\ (call-with-input-string "\