mirrors/redoctober
1
0
Fork 0
mirror of https://github.com/cloudflare/redoctober.git synced 2026-01-03 19:54:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup Go Report Card warnings

Browse Source
This commit is contained in:
Gábor Lipták
2016-11-08 19:37:33 -05:00
parent 78e9720635
commit 6b9fad5e9d
14 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
msp/formatted.go
View File

@@ -28,31 +28,6 @@ func StringToFormatted(f string) (out Formatted, err error) {
return out, errors.New("Invalid string: Needs to begin and end with parentheses.")
}
getNext := func(f string) (string, string) { // f -> (next, rest)
f = strings.TrimSpace(f)
if f[0] == '(' {
return f[0:1], f[1:]
}
nextComma := strings.Index(f, ",")
if f[0] == ')' {
if nextComma == -1 {
return f[0:1], ""
}
return f[0:1], f[nextComma+1:]
} else if nextComma == -1 {
return f[0 : len(f)-1], f[len(f)-1:]
}
nextUnParen := strings.Index(f, ")")
if nextComma < nextUnParen {
return strings.TrimSpace(f[0:nextComma]), f[nextComma+1:]
}
return strings.TrimSpace(f[0:nextUnParen]), f[nextUnParen:]
}
staging := [][]Condition{}
indices := make(map[string]int, 0)
@@ -117,6 +92,31 @@ func StringToFormatted(f string) (out Formatted, err error) {
return out, errors.New("Invalid string: Not finished parsing, but out of data. Too many opening parentheses or too few closing parentheses?")
}
func getNext(f string) (string, string) { // f -> (next, rest)
f = strings.TrimSpace(f)
if f[0] == '(' {
return f[0:1], f[1:]
}
nextComma := strings.Index(f, ",")
if f[0] == ')' {
if nextComma == -1 {
return f[0:1], ""
}
return f[0:1], f[nextComma+1:]
} else if nextComma == -1 {
return f[0 : len(f)-1], f[len(f)-1:]
}
nextUnParen := strings.Index(f, ")")
if nextComma < nextUnParen {
return strings.TrimSpace(f[0:nextComma]), f[nextComma+1:]
}
return strings.TrimSpace(f[0:nextUnParen]), f[nextUnParen:]
}
func (f Formatted) String() string {
out := fmt.Sprintf("(%v", f.Min)