@@ -34,29 +34,12 @@
(srfi srfi-9)
(srfi srfi-26)
(ice-9 format)
- (ice-9 regex)
(ice-9 match)
(ice-9 rdelim)
+ (guix build utils)
(guix ui)
(git))
-(define-record-type <regexp*>
- (%make-regexp* pat flag rx)
- regexp*?
- (pat regexp*-pattern)
- (flag regexp*-flag)
- (rx regexp*-rx))
-
-;;; Work around regexp implementation.
-;;; This record allows to track the regexp pattern and then display it.
-(define* (make-regexp* pat #:optional (flag regexp/extended))
- "Alternative to `make-regexp' producing annotated <regexp*> objects."
- (%make-regexp* pat flag (make-regexp pat flag)))
-
-(define (regexp*-exec rx* str)
- "Execute the RX* regexp, a <regexp*> object."
- (regexp-exec (regexp*-rx rx*) str))
-
(define-record-type <team>
(make-team id name description members scope)
team?
@@ -9,6 +9,7 @@
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023 Carlo Zancanaro <carlo@zancanaro.id.au>
;;;
;;; This file is part of GNU Guix.
@@ -28,6 +29,7 @@
(define-module (guix build utils)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-9)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
@@ -55,6 +57,14 @@ (define-module (guix build utils)
package-name->name+version
parallel-job-count
+ make-regexp*
+ regexp*-exec
+ regexp*?
+ regexp*-pattern
+ regexp*-flag
+ regexp*-rx
+ list-matches*
+
compressor
tarball?
%xz-parallel-args
@@ -163,6 +173,35 @@ (define-syntax-rule (define-constant name val)
(module-replace! (current-module) '(setvbuf)))
(else #f))
+
+;;;
+;;; Extend regexp objects with a pattern field.
+;;;
+(define-record-type <regexp*>
+ (%make-regexp* pat flag rx)
+ regexp*?
+ (pat regexp*-pattern) ;the regexp pattern, a string
+ (flag regexp*-flag) ;regexp flags
+ (rx regexp*-rx)) ;the compiled regexp object
+
+;;; Work around regexp implementation.
+;;; This record allows to track the regexp pattern and then display it.
+(define* (make-regexp* pat #:optional (flag regexp/extended))
+ "Alternative to `make-regexp' producing annotated <regexp*> objects."
+ (%make-regexp* pat flag (make-regexp pat flag)))
+
+(define (regexp*-exec rx* str)
+ "Execute the RX* regexp, a <regexp*> object."
+ (regexp-exec (regexp*-rx rx*) str))
+
+(define* (list-matches* regexp str #:optional (flags regexp/extended))
+ "Like 'list-matches', but also accepting a regexp* as REGEXP."
+ (match regexp
+ ((or (? string?) (? regexp?))
+ (list-matches regexp str flags))
+ ((? regexp*?)
+ (list-matches (regexp*-rx regexp) str flags))))
+
;;;
;;; Compression helpers.