From 5d396c185f0dacfd4f15354bbd31b675803d0167 Mon Sep 17 00:00:00 2001
From: Daniel Bauman <daniel.bauman@stedi.com>
Date: Wed, 10 May 2023 12:21:01 -0700
Subject: [PATCH 1/2] Fix incorrect handling of _ in decimal

BigDecimal supports '_' chars as visual
seperators in number strings in the pre and
post "." parts of the number.

The counting of post "." digits however
counts all characters but it should exclude '_' chars.

The underscore support comes from BigDecimal's use of num-bigint
https://github.com/rust-num/num-bigint/blob/6f2b8e0fc218dbd0f49bebb8db2d1a771fe6bafa/src/biguint/convert.rs#L246

https://github.com/akubera/bigdecimal-rs/issues/100
---
 src/lib.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 85c8702..fbbef79 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1792,7 +1792,10 @@ impl Num for BigDecimal {
                 // copy all trailing characters after '.' into the digits string
                 digits.push_str(trail);
 
-                (digits, trail.len() as i64)
+                // count number of trailing digits
+                let trail_digits = trail.chars().filter(|c| *c != '_').count();
+
+                (digits, trail_digits as i64)
             }
         };
 
@@ -2174,7 +2177,7 @@ mod bigdecimal_tests {
             ("-170141183460469231731687303715884105728", -170141183460469231731687303715884105728),
             ("12.34", 12),
             ("3.14", 3),
-            ("50", 50),            
+            ("50", 50),
             ("0.001", 0),
         ];
         for (s, ans) in vals {
@@ -2190,7 +2193,7 @@ mod bigdecimal_tests {
             ("340282366920938463463374607431768211455", 340282366920938463463374607431768211455),
             ("12.34", 12),
             ("3.14", 3),
-            ("50", 50),            
+            ("50", 50),
             ("0.001", 0),
         ];
         for (s, ans) in vals {
@@ -3035,6 +3038,7 @@ mod bigdecimal_tests {
             ("1.23E+3", 123, -1),
             ("1.23E-8", 123, 10),
             ("-1.23E-10", -123, 12),
+            ("-1_1.2_2", -1122, 2),
         ];
 
         for &(source, val, scale) in vals.iter() {

From 47279e7fbb3a1df697c2a249d1ec55d5397e7650 Mon Sep 17 00:00:00 2001
From: Andrew Kubera <andrewkubera@gmail.com>
Date: Thu, 11 May 2023 22:51:26 -0400
Subject: [PATCH 2/2] Add more test cases to test_from_str

---
 src/lib.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index fbbef79..be41db7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3038,12 +3038,17 @@ mod bigdecimal_tests {
             ("1.23E+3", 123, -1),
             ("1.23E-8", 123, 10),
             ("-1.23E-10", -123, 12),
+            ("123_", 123, 0),
+            ("31_862_140.830_686_979", 31862140830686979, 9),
             ("-1_1.2_2", -1122, 2),
+            ("999.521_939", 999521939, 6),
+            ("679.35_84_03E-2", 679358403, 8),
+            ("271576662.__E4", 271576662, -4),
         ];
 
         for &(source, val, scale) in vals.iter() {
             let x = BigDecimal::from_str(source).unwrap();
-            assert_eq!(x.int_val.to_i32().unwrap(), val);
+            assert_eq!(x.int_val.to_i64().unwrap(), val);
             assert_eq!(x.scale, scale);
         }
     }