diff options
| author | Giacomo Leidi <goodoldpaul@autistici.org> | 2020-05-12 23:31:30 +0200 |
|---|---|---|
| committer | Jelle Licht <jlicht@fsfe.org> | 2020-12-09 22:25:17 +0100 |
| commit | 371ba7b4be81895d202519824bf19893bfdb2526 (patch) | |
| tree | 4883aecf7d86d4b55daf86ecd57417ff716be742 /guix/glob.scm | |
| parent | 52e14cb7988f1f5e5f52ef8487388540fb3e1ae0 (diff) | |
| download | guix-patches-371ba7b4be81895d202519824bf19893bfdb2526.tar guix-patches-371ba7b4be81895d202519824bf19893bfdb2526.tar.gz | |
guix: Add globstar support.
* guix/glob.scm (string->sglob)
(glob-match?): Add globstar support.
* tests/glob.scm: Update accordingly.
Signed-off-by: Jelle Licht <jlicht@fsfe.org>
Diffstat (limited to 'guix/glob.scm')
| -rw-r--r-- | guix/glob.scm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/guix/glob.scm b/guix/glob.scm index a9fc744802..d73783cd30 100644 --- a/guix/glob.scm +++ b/guix/glob.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,11 @@ STR, a glob pattern such as \"foo*\" or \"foo??bar\"." (flatten (reverse (if (null? pending) result (cons-string pending result))))) + ((#\* #\* #\/ . rest) + (if (zero? brackets) + (loop rest '() 0 + (cons* '**/ (cons-string pending result))) + (loop rest (cons '**/ pending) brackets result))) (((and chr (or #\? #\*)) . rest) (let ((wildcard (match chr (#\? '?) @@ -121,6 +127,15 @@ STR, a glob pattern such as \"foo*\" or \"foo??bar\"." (string-null? str)) (('*) #t) + (('**/) + #t) + (('**/ suffix . rest) + (let ((rest (if (eq? '* suffix) (cdr rest) rest)) + (suffix (if (eq? '* suffix) (car rest) suffix))) + (match (string-contains str suffix) + (#f #f) + (index (loop rest (string-drop str + (+ index (string-length suffix)))))))) (('* suffix . rest) (match (string-contains str suffix) (#f #f) |