branch master updated: website: scripts: Work around failure with guile@3.0.7.

[Florian Pelz]

This is an automated email from the git hooks/post-receive script.

pelzflorian pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new f66b873  website: scripts: Work around failure with guile@3.0.7.
f66b873 is described below

commit f66b87373b33974751d2567f8c433ce44d07f10a
Author: Florian Pelz <pelzflorian@pelzflorian.de>
AuthorDate: Sat Aug 7 12:22:19 2021 +0200

    website: scripts: Work around failure with guile@3.0.7.
    
    See <https://bugs.gnu.org/49910>.  Keep until the script works with
    the Guile referred to in website/manifest.scm.
    
    * website/scripts/sexp-xgettext.scm (token->string-symbol-or-keyw):
    Add special case for parsing ",@" tokens.
---
 website/scripts/sexp-xgettext.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/website/scripts/sexp-xgettext.scm 
b/website/scripts/sexp-xgettext.scm
index a7c19be..02c17f3 100644
--- a/website/scripts/sexp-xgettext.scm
+++ b/website/scripts/sexp-xgettext.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix web site
-;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -485,6 +485,12 @@ if no tokens or lists exist."
   "For a parse tree TOK, if it is a 'token parse tree, return its
 value as a string, symbol or #:-keyword, otherwise return #f."
   (match tok
+    ;; Workaround for bug in guile@3.0.7 <https://bugs.gnu.org/49910>.
+    ;; TODO: Remove this workaround when a new guile does not error out on
+    ;;  guile -c '(pk (with-input-from-string ",@" (lambda () (read))))'
+    (('token ",@")
+     (list 'unquote-splicing (with-input-from-string "" (lambda () (read)))))
+    ;; End of workaround.
     (('token (parts ...) . remaining)
      ;; This is a string with line breaks in it.
      (with-input-from-string