Account for case with too many fractional digits

richardwilkes · May 13, 2019 · 33d1050 · 33d1050
1 parent 6c9684d
commit 33d1050
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/xmath/fixed/fixed.go b/xmath/fixed/fixed.go
@@ -102,7 +102,11 @@ func Parse(str string) (Fixed, error) {
 		for buffer.Len() < precision+1 {
 			buffer.WriteString("0")
 		}
-		if fraction, err = strconv.ParseInt(buffer.String(), 10, 64); err != nil {
+		frac := buffer.String()
+		if len(frac) > precision+1 {
+			frac = frac[:precision+1]
+		}
+		if fraction, err = strconv.ParseInt(frac, 10, 64); err != nil {
 			return 0, errs.Wrap(err)
 		}
 		value += fraction - multiplier

diff --git a/xmath/fixed/fixed_test.go b/xmath/fixed/fixed_test.go
@@ -36,6 +36,14 @@ func TestConversion(t *testing.T) {
 	assert.Equal(t, "-1", fixed.FromFloat64(-1.00009).String())
 	assert.Equal(t, "0.0004", fixed.FromFloat64(0.000405).String())
 	assert.Equal(t, "-0.0004", fixed.FromFloat64(-0.000405).String())
+
+	v, err := fixed.Parse("33.0")
+	assert.NoError(t, err)
+	assert.Equal(t, v, fixed.FromInt(33))
+
+	v, err = fixed.Parse("33.00000000000000000000")
+	assert.NoError(t, err)
+	assert.Equal(t, v, fixed.FromInt(33))
 }
 
 func TestAddSub(t *testing.T) {