From c786a2bd3ec3b186f94f913bdd96db282141afc3 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 9 Nov 2022 19:02:30 +0100
Subject: [PATCH] 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>
---
reference/regexp.go | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/reference/regexp.go b/reference/regexp.go
index 916c4e609..9875d4ae1 100644
--- a/reference/regexp.go
+++ b/reference/regexp.go
@@ -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.