1
0
mirror of https://github.com/distribution/distribution synced 2024-11-06 19:35:52 +01:00

reference: inline "group()"

It was only used in a couple of places, and more transparent to just
inline it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-11-09 19:02:30 +01:00
parent 1d4917d4fb
commit c786a2bd3e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C

@ -145,18 +145,13 @@ func expression(res ...string) string {
// optional wraps the expression in a non-capturing group and makes the
// production optional.
func optional(res ...string) string {
return group(strings.Join(res, "")) + `?`
return `(?:` + strings.Join(res, "") + `)?`
}
// repeated wraps the regexp in a non-capturing group to get one or more
// matches.
func repeated(res ...string) string {
return group(strings.Join(res, "")) + `+`
}
// group wraps the regexp in a non-capturing group.
func group(res ...string) string {
return `(?:` + strings.Join(res, "") + `)`
return `(?:` + strings.Join(res, "") + `)+`
}
// capture wraps the expression in a capturing group.