summaryrefslogtreecommitdiff
path: root/internal/regex/regex.go
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-10-09 21:10:29 +0300
committerPaul Buetow <paul@buetow.org>2021-10-10 13:36:41 +0300
commitea1de3044e129d419f4e807f2624a009343a128f (patch)
tree9ff1335ca26afc90e55fd6de416457e252d75a35 /internal/regex/regex.go
parent7563abe9d5beaa18fa1eab0f65668f5dfcf79052 (diff)
vetting and linting and some code restyling
Diffstat (limited to 'internal/regex/regex.go')
-rw-r--r--internal/regex/regex.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/internal/regex/regex.go b/internal/regex/regex.go
index 352ffd6..eb6e1b3 100644
--- a/internal/regex/regex.go
+++ b/internal/regex/regex.go
@@ -48,9 +48,7 @@ func new(regexStr string, flags []Flag) (Regex, error) {
regexStr: regexStr,
flags: flags,
}
-
re, err := regexp.Compile(regexStr)
-
if err != nil {
return r, err
}
@@ -94,11 +92,9 @@ func (r Regex) Serialize() (string, error) {
for _, flag := range r.flags {
flags = append(flags, flag.String())
}
-
if !r.initialized {
return "", fmt.Errorf("Unable to serialize regex as not initialized properly: %v", r)
}
-
return fmt.Sprintf("regex:%s %s", strings.Join(flags, ","), r.regexStr), nil
}
@@ -109,12 +105,12 @@ func Deserialize(str string) (Regex, error) {
if len(s) < 2 {
return NewNoop(), nil
}
-
flagsStr := s[0]
regexStr := s[1]
if !strings.HasPrefix(flagsStr, "regex") {
- return Regex{}, fmt.Errorf("unable to deserialize regex '%s': should start with string 'regex'", str)
+ return Regex{}, fmt.Errorf("unable to deserialize regex '%s': should start "+
+ "with string 'regex'", str)
}
// Parse regex flags, e.g. "regex:flag1,flag2,flag3..."
@@ -129,6 +125,5 @@ func Deserialize(str string) (Regex, error) {
flags = append(flags, flag)
}
}
-
return new(regexStr, flags)
}