From 99657750cc781e41c9c1e3be6b6316c18fc430bd Mon Sep 17 00:00:00 2001
From: joeybloggs <Dean.Karn@gmail.com>
Date: Fri, 12 Aug 2016 22:03:24 -0400
Subject: ad variable grouping logic + cleanup generated code newlines

---
 pa_Guru/pa_Guru.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'pa_Guru')

diff --git a/pa_Guru/pa_Guru.go b/pa_Guru/pa_Guru.go
index 961bd4d5..bed7dd00 100644
--- a/pa_Guru/pa_Guru.go
+++ b/pa_Guru/pa_Guru.go
@@ -87,19 +87,18 @@ func (pa *pa_Guru) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin
 // avoid allocations; otherwise just cast as string.
 func (pa *pa_Guru) 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(pa.decimal) + len(pa.group)*len(s[:len(s)-int(v)-1])/3
-
 	count := 0
 	inWhole := v == 0
+	inSecondary := false
+	groupThreshold := 3
 
 	b := make([]byte, 0, l)
 
 	for i := len(s) - 1; i >= 0; i-- {
 
 		if s[i] == '.' {
-
 			for j := len(pa.decimal) - 1; j >= 0; j-- {
 				b = append(b, pa.decimal[j])
 			}
@@ -111,13 +110,14 @@ func (pa *pa_Guru) FmtNumber(num float64, v uint64) []byte {
 
 		if inWhole {
 
-			if count == 3 {
+			if count == groupThreshold {
+				b = append(b, pa.group[0])
+				count = 1
 
-				for j := len(pa.group) - 1; j >= 0; j-- {
-					b = append(b, pa.group[j])
+				if !inSecondary {
+					inSecondary = true
+					groupThreshold = 2
 				}
-
-				count = 1
 			} else {
 				count++
 			}
@@ -126,11 +126,14 @@ func (pa *pa_Guru) FmtNumber(num float64, v uint64) []byte {
 		b = append(b, s[i])
 	}
 
+	if num < 0 {
+		b = append(b, pa.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
-
 }
-- 
cgit v1.2.3