improve str_as_int logic

Author: samuelcolvin

src/input/shared.rs

@@ -44,23 +44,28 @@ pub fn int_as_bool<'a>(input: &'a impl Input<'a>, int: i64) -> ValResult<'a, boo
 }
 
 pub fn str_as_int<'s, 'l>(input: &'s impl Input<'s>, str: &'l str) -> ValResult<'s, i64> {
-    let str = strip_decimal_zeros(str);
     if let Ok(i) = str.parse::<i64>() {
         Ok(i)
+    } else if let Some(s) = strip_decimal_zeros(str) {
+        if let Ok(i) = s.parse::<i64>() {
+            Ok(i)
+        } else {
+            Err(ValError::new(ErrorType::IntParsing, input))
+        }
     } else {
         Err(ValError::new(ErrorType::IntParsing, input))
     }
 }
 
 /// we don't want to parse as f64 then call `float_as_int` as it can loose precision for large ints, therefore
-/// we strip `.0+` manually
-fn strip_decimal_zeros(s: &str) -> &str {
+/// we strip `.0+` manually instead, then parse as i64
+fn strip_decimal_zeros(s: &str) -> Option<&str> {
     if let Some(i) = s.find('.') {
         if s[i + 1..].chars().all(|c| c == '0') {
-            return &s[..i];
+            return Some(&s[..i]);
         }
     }
-    s
+    None
 }
 
 pub fn float_as_int<'a>(input: &'a impl Input<'a>, float: f64) -> ValResult<'a, i64> {