ad variable grouping logic + cleanup generated code newlines

1 files changed, 8 insertions, 17 deletions

diff --git a/hr/hr.go b/hr/hr.go
index 544d6731..dfc170cd 100644
--- a/hr/hr.go
+++ b/hr/hr.go
@@ -55,8 +55,8 @@ func (hr *hr) CardinalPluralRule(num float64, v uint64) locales.PluralRule {
 	n := math.Abs(num)
 	i := int64(n)
 	f := locales.F(n, v)
-	iMod10 := i % 10
 	iMod100 := i % 100
+	iMod10 := i % 10
 	fMod10 := f % 10
 	fMod100 := f % 100
 
@@ -107,36 +107,24 @@ func (hr *hr) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint64)
 // avoid allocations; otherwise just cast as string.
 func (hr *hr) FmtNumber(num float64, v uint64) []byte {
 
-	s := strconv.FormatFloat(num, 'f', int(v), 64)
-
+	s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64)
 	l := len(s) + len(hr.decimal) + len(hr.group)*len(s[:len(s)-int(v)-1])/3
-
 	count := 0
 	inWhole := v == 0
-
 	b := make([]byte, 0, l)
 
 	for i := len(s) - 1; i >= 0; i-- {
 
 		if s[i] == '.' {
-
-			for j := len(hr.decimal) - 1; j >= 0; j-- {
-				b = append(b, hr.decimal[j])
-			}
-
+			b = append(b, hr.decimal[0])
 			inWhole = true
 
 			continue
 		}
 
 		if inWhole {
-
 			if count == 3 {
-
-				for j := len(hr.group) - 1; j >= 0; j-- {
-					b = append(b, hr.group[j])
-				}
-
+				b = append(b, hr.group[0])
 				count = 1
 			} else {
 				count++
@@ -146,11 +134,14 @@ func (hr *hr) FmtNumber(num float64, v uint64) []byte {
 		b = append(b, s[i])
 	}
 
+	if num < 0 {
+		b = append(b, hr.minus[0])
+	}
+
 	// reverse
 	for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 {
 		b[i], b[j] = b[j], b[i]
 	}
 
 	return b
-
 }