remove unused "uppercase" param of appendTransliterate(), improve readability (#172)

diacritics.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"strconv"
-	"strings"
+	"unicode"
 )
 
 var normMap map[rune]rune
@@ -14,19 +14,17 @@ func init() {
 	appendTransliterate(
 		"ěřůøĉĝĥĵŝŭèùÿėįųāēīūļķņģőűëïąćęłńśźżõșțčďĺľňŕšťýžéíñóúüåäöçîşûğăâđêôơưáàãảạ",
 		"eruocghjsueuyeiuaeiulkngoueiacelnszzostcdllnrstyzeinouuaaocisugaadeoouaaaaa",
-		true,
 	)
 
 	// Vietnamese
 	appendTransliterate(
 		"áạàảãăắặằẳẵâấậầẩẫéẹèẻẽêếệềểễiíịìỉĩoóọòỏõôốộồổỗơớợờởỡúụùủũưứựừửữyýỵỳỷỹđ",
 		"aaaaaaaaaaaaaaaaaeeeeeeeeeeeiiiiiioooooooooooooooooouuuuuuuuuuuyyyyyyd",
-		true,
 	)
 
 }
 
-func appendTransliterate(base, norm string, uppercase bool) {
+func appendTransliterate(base, norm string) {
 	normRunes := []rune(norm)
 	baseRunes := []rune(base)
 
@@ -36,24 +34,20 @@ func appendTransliterate(base, norm string, uppercase bool) {
 		panic("Base and normalized strings have differend length: base=" + strconv.Itoa(lenBase) + ", norm=" + strconv.Itoa(lenNorm)) // programmer error in constant length
 	}
 
-	for i, baseRune := range baseRunes {
+	for i := 0; i < lenBase; i++ {
-		normMap[baseRune] = normRunes[i]
+		normMap[baseRunes[i]] = normRunes[i]
-	}
 
-	if uppercase {
+		baseUpper := unicode.ToUpper(baseRunes[i])
-		upperBase := strings.ToUpper(base)
+		normUpper := unicode.ToUpper(normRunes[i])
-		upperNorm := strings.ToUpper(norm)
+
-		normRune := []rune(upperNorm)
+		normMap[baseUpper] = normUpper
-		for i, baseRune := range []rune(upperBase) {
-			normMap[baseRune] = normRune[i]
-		}
 	}
 }
 
 // Remove diacritics and make lowercase.
 func removeDiacritics(baseString string) string {
 	var normalizedRunes []rune
-	for _, baseRune := range []rune(baseString) {
+	for _, baseRune := range baseString {
 		if normRune, ok := normMap[baseRune]; ok {
 			normalizedRunes = append(normalizedRunes, normRune)
 		} else {