From: "Wicki Gabriel (wicg)" <wicg@zhaw.ch>
To: 62814@debbugs.gnu.org
Subject: [bug#62814] [PATCH] Clarify substitute* docstring with an additional example
Date: Thu, 13 Apr 2023 11:44:11 +0000 [thread overview]
Message-ID: <ZR0P278MB0268B5F3B738F33123BA2F98C1989@ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 215 bytes --]
Hello
I've created this little patch after wondering how to match (and substitute*) against end-of-line. My patch is based on
982698c52fb388e278dc4cec4b124406f23f102a.
Thanks for review and merge.
gabber
[-- Attachment #1.2: Type: text/html, Size: 1696 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-build-utils-Clarify-substitute-docstring-with-a.patch --]
[-- Type: text/x-patch; name="0001-guix-build-utils-Clarify-substitute-docstring-with-a.patch", Size: 1691 bytes --]
From 5ae3c5512e85189a47c859c6128adfd3bfc63159 Mon Sep 17 00:00:00 2001
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Thu, 13 Apr 2023 10:31:57 +0200
Subject: [PATCH] guix: build: utils: Clarify substitute* docstring with an
example.
* guix/build/utils.scm (substitute*): Add an example on how to match
end-of-line.
* doc/guix.texi (Build Utilities): Update the corresponding passage.
---
doc/guix.texi | 3 ++-
guix/build/utils.scm | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index acb6f0c2e1..71fa9f1dea 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10321,7 +10321,8 @@ Alternatively, @var{file} may be a list of file names, in which case
they are all subject to the substitutions.
Be careful about using @code{$} to match the end of a line; by itself it
-won't match the terminating newline of a line.
+won't match the terminating newline of a line, e.g. to match a whole
+line ending with a backslash, one needs a regex like @code{"(.*)\\\\\n$"}.
@end defmac
@subsection File Search
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index dd5a91f52f..6add9afc1b 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -957,7 +957,8 @@ (define-syntax substitute*
all subject to the substitutions.
Be careful about using '$' to match the end of a line; by itself it won't
-match the terminating newline of a line."
+match the terminating newline of a line, e.g. to match a whole line ending
+with a backslash, one needs a regex like \"(.*)\\\\\n$\"."
((substitute* file ((regexp match-var ...) body ...) ...)
(let ()
(define (substitute-one-file file-name)
--
2.39.2
next reply other threads:[~2023-04-13 11:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 11:44 Wicki Gabriel (wicg) [this message]
2023-05-11 12:38 ` bug#62814: [PATCH] Clarify substitute* docstring with an additional example Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZR0P278MB0268B5F3B738F33123BA2F98C1989@ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM \
--to=wicg@zhaw.ch \
--cc=62814@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.