From 99657750cc781e41c9c1e3be6b6316c18fc430bd Mon Sep 17 00:00:00 2001 From: joeybloggs Date: Fri, 12 Aug 2016 22:03:24 -0400 Subject: ad variable grouping logic + cleanup generated code newlines --- ar_TN/ar_TN.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'ar_TN/ar_TN.go') diff --git a/ar_TN/ar_TN.go b/ar_TN/ar_TN.go index 8b487ca0..19323bb2 100644 --- a/ar_TN/ar_TN.go +++ b/ar_TN/ar_TN.go @@ -136,36 +136,24 @@ func (ar *ar_TN) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (ar *ar_TN) 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(ar.decimal) + len(ar.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(ar.decimal) - 1; j >= 0; j-- { - b = append(b, ar.decimal[j]) - } - + b = append(b, ar.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - - for j := len(ar.group) - 1; j >= 0; j-- { - b = append(b, ar.group[j]) - } - + b = append(b, ar.group[0]) count = 1 } else { count++ @@ -175,11 +163,16 @@ func (ar *ar_TN) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(ar.minus) - 1; j >= 0; j-- { + b = append(b, ar.minus[j]) + } + } + // 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 - } -- cgit v1.2.3