etc: teams: Fix regexp match and execution.

This is a follow up to commit 4d7b25a0 ("etc: teams: Sort and improve display
of regular expression in 'scope' field.").

* etc/teams.scm.in (regexp-exec*): Rename to...
(regexp*-exec): ... this.
(find-team-by-scope): Replace regexp? with regexp*?.  Replace regexp-exec with
regexp*-exec.
This commit is contained in:
Maxim Cournoyer 2023-08-30 15:37:42 -04:00
parent d72c3fcf2d
commit d6966b8a5b
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -53,7 +53,7 @@ (define* (make-regexp* pat #:optional (flag regexp/extended))
"Alternative to `make-regexp' producing annotated <regexp*> objects." "Alternative to `make-regexp' producing annotated <regexp*> objects."
(%make-regexp* pat flag (make-regexp pat flag))) (%make-regexp* pat flag (make-regexp pat flag)))
(define (regexp-exec* rx* str) (define (regexp*-exec rx* str)
"Execute the RX* regexp, a <regexp*> object." "Execute the RX* regexp, a <regexp*> object."
(regexp-exec (regexp*-rx rx*) str)) (regexp-exec (regexp*-rx rx*) str))
@ -653,8 +653,8 @@ (define (find-team-by-scope files)
(any (match-lambda (any (match-lambda
((? string? scope) ((? string? scope)
(string=? scope file)) (string=? scope file))
((? regexp? scope) ((? regexp*? scope)
(regexp-exec scope file))) (regexp*-exec scope file)))
(team-scope team))) (team-scope team)))
files) files)
(cons team acc) (cons team acc)