Merge pull request #44 from dmarkham/dan/issue-43

dmarkham · web-flow · commit 9d0b7d4c6717 · 2021-07-21T23:20:05.000-07:00
Return the same string passed for error
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ matrix:
   allow_failures:
   - go: master
   include:
-  - go: 1.14.x
   - go: 1.15.x
+  - go: 1.16.x
   - go: master
 env:
   global:
@@ -24,6 +24,6 @@ deploy:
   - cli/build/enumer.windows-amd64.exe.tar.gz
   - cli/build/sha256sum.txt
   on:
-    go: 1.15.x
+    go: 1.16.x
     repo: dmarkham/enumer
     tags: true
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Enumer [![GoDoc](https://godoc.org/github.com/dmarkham/enumer?status.svg)](https://godoc.org/github.com/dmarkham/enumer) [![Go Report Card](https://goreportcard.com/badge/github.com/dmarkham/enumer)](https://goreportcard.com/report/github.com/dmarkham/enumer) [![GitHub Release](https://img.shields.io/github/release/dmarkham/enumer.svg)](https://github.com/dmarkham/enumer/releases)[![Build Status](https://travis-ci.org/dmarkham/enumer.svg?branch=master)](https://travis-ci.org/dmarkham/enumer)
+# Enumer [![GoDoc](https://godoc.org/github.com/dmarkham/enumer?status.svg)](https://godoc.org/github.com/dmarkham/enumer) [![Go Report Card](https://goreportcard.com/badge/github.com/dmarkham/enumer)](https://goreportcard.com/report/github.com/dmarkham/enumer) [![GitHub Release](https://img.shields.io/github/release/dmarkham/enumer.svg)](https://github.com/dmarkham/enumer/releases)[![Build Status](https://travis-ci.com/dmarkham/enumer.svg?branch=master)](https://travis-ci.com/dmarkham/enumer)
 
 
 Enumer is a tool to generate Go code that adds useful methods to Go enums (constants with a specific type).
diff --git a/enumer.go b/enumer.go
@@ -10,8 +10,8 @@ func %[1]sString(s string) (%[1]s, error) {
 	if val, ok := _%[1]sNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _%[1]sNameToValueMap[s]; ok {
+
+	if val, ok := _%[1]sNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%%s does not belong to %[1]s values", s)
diff --git a/testdata/day.golden b/testdata/day.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/dayTrimAndPrefix.golden b/testdata/dayTrimAndPrefix.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/dayWithLinecomment.golden b/testdata/dayWithLinecomment.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/dayWithPrefix.golden b/testdata/dayWithPrefix.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/gap.golden b/testdata/gap.golden
@@ -81,8 +81,8 @@ func GapString(s string) (Gap, error) {
 	if val, ok := _GapNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _GapNameToValueMap[s]; ok {
+
+	if val, ok := _GapNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Gap values", s)
diff --git a/testdata/num.golden b/testdata/num.golden
@@ -53,8 +53,8 @@ func NumString(s string) (Num, error) {
 	if val, ok := _NumNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _NumNameToValueMap[s]; ok {
+
+	if val, ok := _NumNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Num values", s)
diff --git a/testdata/offset.golden b/testdata/offset.golden
@@ -45,8 +45,8 @@ func NumberString(s string) (Number, error) {
 	if val, ok := _NumberNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _NumberNameToValueMap[s]; ok {
+
+	if val, ok := _NumberNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Number values", s)
diff --git a/testdata/prime.golden b/testdata/prime.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeGQLGen.golden b/testdata/primeGQLGen.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeJson.golden b/testdata/primeJson.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeJsonAndSql.golden b/testdata/primeJsonAndSql.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeSql.golden b/testdata/primeSql.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeText.golden b/testdata/primeText.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/primeYaml.golden b/testdata/primeYaml.golden
@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {
 	if val, ok := _PrimeNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _PrimeNameToValueMap[s]; ok {
+
+	if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Prime values", s)
diff --git a/testdata/trimPrefix.golden b/testdata/trimPrefix.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/trimPrefixMultiple.golden b/testdata/trimPrefixMultiple.golden
@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {
 	if val, ok := _DayNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _DayNameToValueMap[s]; ok {
+
+	if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Day values", s)
diff --git a/testdata/unum.golden b/testdata/unum.golden
@@ -63,8 +63,8 @@ func UnumString(s string) (Unum, error) {
 	if val, ok := _UnumNameToValueMap[s]; ok {
 		return val, nil
 	}
-	s = strings.ToLower(s)
-	if val, ok := _UnumNameToValueMap[s]; ok {
+
+	if val, ok := _UnumNameToValueMap[strings.ToLower(s)]; ok {
 		return val, nil
 	}
 	return 0, fmt.Errorf("%s does not belong to Unum values", s)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# Enumer [![GoDoc](https://godoc.org/github.com/dmarkham/enumer?status.svg)](https://godoc.org/github.com/dmarkham/enumer) [![Go Report Card](https://goreportcard.com/badge/github.com/dmarkham/enumer)](https://goreportcard.com/report/github.com/dmarkham/enumer) [![GitHub Release](https://img.shields.io/github/release/dmarkham/enumer.svg)](https://github.com/dmarkham/enumer/releases)[![Build Status](https://travis-ci.org/dmarkham/enumer.svg?branch=master)](https://travis-ci.org/dmarkham/enumer)
	`1`	+# Enumer [![GoDoc](https://godoc.org/github.com/dmarkham/enumer?status.svg)](https://godoc.org/github.com/dmarkham/enumer) [![Go Report Card](https://goreportcard.com/badge/github.com/dmarkham/enumer)](https://goreportcard.com/report/github.com/dmarkham/enumer) [![GitHub Release](https://img.shields.io/github/release/dmarkham/enumer.svg)](https://github.com/dmarkham/enumer/releases)[![Build Status](https://travis-ci.com/dmarkham/enumer.svg?branch=master)](https://travis-ci.com/dmarkham/enumer)
`2`	`2`
`3`	`3`
`4`	`4`	`Enumer is a tool to generate Go code that adds useful methods to Go enums (constants with a specific type).`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ func %[1]sString(s string) (%[1]s, error) {`
`10`	`10`	`if val, ok := _%[1]sNameToValueMap[s]; ok {`
`11`	`11`	`return val, nil`
`12`	`12`	`}`
`13`		`- s = strings.ToLower(s)`
`14`		`- if val, ok := _%[1]sNameToValueMap[s]; ok {`
	`13`	`+`
	`14`	`+ if val, ok := _%[1]sNameToValueMap[strings.ToLower(s)]; ok {`
`15`	`15`	`return val, nil`
`16`	`16`	`}`
`17`	`17`	`return 0, fmt.Errorf("%%s does not belong to %[1]s values", s)`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ func DayString(s string) (Day, error) {`
`60`	`60`	`if val, ok := _DayNameToValueMap[s]; ok {`
`61`	`61`	`return val, nil`
`62`	`62`	`}`
`63`		`- s = strings.ToLower(s)`
`64`		`- if val, ok := _DayNameToValueMap[s]; ok {`
	`63`	`+`
	`64`	`+ if val, ok := _DayNameToValueMap[strings.ToLower(s)]; ok {`
`65`	`65`	`return val, nil`
`66`	`66`	`}`
`67`	`67`	`return 0, fmt.Errorf("%s does not belong to Day values", s)`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ func GapString(s string) (Gap, error) {`
`81`	`81`	`if val, ok := _GapNameToValueMap[s]; ok {`
`82`	`82`	`return val, nil`
`83`	`83`	`}`
`84`		`- s = strings.ToLower(s)`
`85`		`- if val, ok := _GapNameToValueMap[s]; ok {`
	`84`	`+`
	`85`	`+ if val, ok := _GapNameToValueMap[strings.ToLower(s)]; ok {`
`86`	`86`	`return val, nil`
`87`	`87`	`}`
`88`	`88`	`return 0, fmt.Errorf("%s does not belong to Gap values", s)`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ func NumString(s string) (Num, error) {`
`53`	`53`	`if val, ok := _NumNameToValueMap[s]; ok {`
`54`	`54`	`return val, nil`
`55`	`55`	`}`
`56`		`- s = strings.ToLower(s)`
`57`		`- if val, ok := _NumNameToValueMap[s]; ok {`
	`56`	`+`
	`57`	`+ if val, ok := _NumNameToValueMap[strings.ToLower(s)]; ok {`
`58`	`58`	`return val, nil`
`59`	`59`	`}`
`60`	`60`	`return 0, fmt.Errorf("%s does not belong to Num values", s)`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ func NumberString(s string) (Number, error) {`
`45`	`45`	`if val, ok := _NumberNameToValueMap[s]; ok {`
`46`	`46`	`return val, nil`
`47`	`47`	`}`
`48`		`- s = strings.ToLower(s)`
`49`		`- if val, ok := _NumberNameToValueMap[s]; ok {`
	`48`	`+`
	`49`	`+ if val, ok := _NumberNameToValueMap[strings.ToLower(s)]; ok {`
`50`	`50`	`return val, nil`
`51`	`51`	`}`
`52`	`52`	`return 0, fmt.Errorf("%s does not belong to Number values", s)`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ func PrimeString(s string) (Prime, error) {`
`97`	`97`	`if val, ok := _PrimeNameToValueMap[s]; ok {`
`98`	`98`	`return val, nil`
`99`	`99`	`}`
`100`		`- s = strings.ToLower(s)`
`101`		`- if val, ok := _PrimeNameToValueMap[s]; ok {`
	`100`	`+`
	`101`	`+ if val, ok := _PrimeNameToValueMap[strings.ToLower(s)]; ok {`
`102`	`102`	`return val, nil`
`103`	`103`	`}`
`104`	`104`	`return 0, fmt.Errorf("%s does not belong to Prime values", s)`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ func UnumString(s string) (Unum, error) {`
`63`	`63`	`if val, ok := _UnumNameToValueMap[s]; ok {`
`64`	`64`	`return val, nil`
`65`	`65`	`}`
`66`		`- s = strings.ToLower(s)`
`67`		`- if val, ok := _UnumNameToValueMap[s]; ok {`
	`66`	`+`
	`67`	`+ if val, ok := _UnumNameToValueMap[strings.ToLower(s)]; ok {`
`68`	`68`	`return val, nil`
`69`	`69`	`}`
`70`	`70`	`return 0, fmt.Errorf("%s does not belong to Unum values", s)`