use tagged switches

Author: xoudini

skeleton/datetime.go

@@ -74,11 +74,12 @@ func ParseDateTimeSkeleton(skeleton string, locale string) (*DateTimeFormatOptio
 		// Era
 		case 'G':
 			var era string
-			if length == 4 {
+			switch length {
+			case 4:
 				era = "long"
-			} else if length == 5 {
+			case 5:
 				era = "narrow"
-			} else {
+			default:
 				era = "short"
 			}
 			result.Era = &era
@@ -121,11 +122,12 @@ func ParseDateTimeSkeleton(skeleton string, locale string) (*DateTimeFormatOptio
 		// Weekday
 		case 'E':
 			var weekday string
-			if length == 4 {
+			switch length {
+			case 4:
 				weekday = "long"
-			} else if length == 5 {
+			case 5:
 				weekday = "narrow"
-			} else {
+			default:
 				weekday = "short"
 			}
 			result.Weekday = &weekday

skeleton/number.go

@@ -176,11 +176,12 @@ func parseConciseScientificAndEngineeringStem(stem string) *NumberFormatOptions
 
 	if len(stem) >= 2 {
 		signDisplay := stem[0:2]
-		if signDisplay == "+!" {
+		switch signDisplay {
+		case "+!":
 			sd := "always"
 			result.SignDisplay = &sd
 			stem = stem[2:]
-		} else if signDisplay == "+?" {
+		case "+?":
 			sd := "exceptZero"
 			result.SignDisplay = &sd
 			stem = stem[2:]

skeleton/transforms.go

@@ -56,7 +56,8 @@ func TransformJPatterns(skeleton string, locale string) string {
 	for i < len(skeleton) {
 		ch := skeleton[i]
 
-		if ch == 'j' {
+		switch ch {
+		case 'j':
 			// Count consecutive j's
 			count := 0
 			for i < len(skeleton) && skeleton[i] == 'j' {
@@ -93,7 +94,7 @@ func TransformJPatterns(skeleton string, locale string) string {
 					result.WriteString("a")
 				}
 			}
-		} else if ch == 'J' {
+		case 'J':
 			// Count consecutive J's
 			count := 0
 			for i < len(skeleton) && skeleton[i] == 'J' {
@@ -107,7 +108,7 @@ func TransformJPatterns(skeleton string, locale string) string {
 			} else {
 				result.WriteString("H")
 			}
-		} else {
+		default:
 			result.WriteByte(ch)
 			i++
 		}