amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

po: Don't replace newline escapes that are escaped themselves.

Browse source 
Otherwise the cookbook is read incorrectly at
msgid ""
"(display (string-append \"Hello \" \"Guix\" \"\\n\"))\n"

This can be seen at the `git diff` when beginning to
run `make download-po`.

* guix/build/po.scm (final-character-escapes?): New procedure.
(interpret-newline-escape): Use it.

Change-Id: I2b036000173b1e282e2aeceffe3491e0917e51ca
This commit is contained in:
Florian Pelz 2025-09-15 14:52:36 +02:00
parent 3bc0cf8839
commit e16cfd61f9
No known key found for this signature in database
GPG key ID: 300888CB39C63817
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guix/build/po.scm
View file

@ -48,8 +48,15 @@
(and (ignore "\"") (* str-chr) (ignore "\"") (and (ignore "\"") (* str-chr) (ignore "\"")
(? (and (ignore (* whitespace)) content)))) (? (and (ignore (* whitespace)) content))))
(define (final-character-escapes? str last-index)
"Check if STR ends in an incomplete escape sequence, that is ends in an uneven
number of backslashes. LAST-INDEX is the index of its last character."
(and (>= last-index 0)
(eqv? (string-ref str last-index) #\\)
(not (final-character-escapes? str (- last-index 1)))))
(define (interpret-newline-escape str) (define (interpret-newline-escape str)
"Replace '\\n' sequences in STR with a newline character." "Replace unescaped '\\n' sequences in STR with a newline character."
(let loop ((str str) (let loop ((str str)
(result '())) (result '()))
(match (string-contains str "\\n") (match (string-contains str "\\n")
@ -57,7 +64,10 @@
(index (index
(let ((prefix (string-take str index))) (let ((prefix (string-take str index)))
(loop (string-drop str (+ 2 index)) (loop (string-drop str (+ 2 index))
(append (list "\n" prefix) result))))))) ;; Only add a newline when the backslash is not escaped itself.
(if (final-character-escapes? str (- index 1))
(cons (string-take str (+ 2 index)) result)
(append (list "\n" prefix) result))))))))
(define (parse-tree->assoc parse-tree) (define (parse-tree->assoc parse-tree)
"Converts a po PARSE-TREE to an association list, where the key is the msgid "Converts a po PARSE-TREE to an association list, where the key is the msgid