fix: Match optional +/- prefix on float

winnow-rs · Jan 3, 2024 · 25e2d08 · 25e2d08
1 parent 35fdb62
commit 25e2d08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/src/ascii/mod.rs b/src/ascii/mod.rs
@@ -1367,8 +1367,12 @@ where
     alt((
         recognize_float,
         crate::token::tag_no_case("nan"),
-        crate::token::tag_no_case("infinity"),
-        crate::token::tag_no_case("inf"),
+        (
+            opt(one_of(['+', '-'])),
+            crate::token::tag_no_case("infinity"),
+        )
+            .recognize(),
+        (opt(one_of(['+', '-'])), crate::token::tag_no_case("inf")).recognize(),
     ))
     .parse_next(input)
 }

diff --git a/src/ascii/tests.rs b/src/ascii/tests.rs
@@ -566,24 +566,17 @@ mod complete {
 
             println!("now parsing: {} -> {}", test, expected32);
 
-            if (test.starts_with('-') || test.starts_with('+')) && expected32.is_infinite() {
-                assert!(float::<_, f32, ()>.parse_peek(test.as_bytes()).is_err());
-                assert!(float::<_, f32, ()>.parse_peek(test).is_err());
-                assert!(float::<_, f64, ()>.parse_peek(test.as_bytes()).is_err());
-                assert!(float::<_, f64, ()>.parse_peek(test).is_err());
-            } else {
-                assert_parse!(
-                    float.parse_peek(test.as_bytes()),
-                    Ok((&b""[..], expected32))
-                );
-                assert_parse!(float.parse_peek(test), Ok(("", expected32)));
-
-                assert_parse!(
-                    float.parse_peek(test.as_bytes()),
-                    Ok((&b""[..], expected64))
-                );
-                assert_parse!(float.parse_peek(test), Ok(("", expected64)));
-            }
+            assert_parse!(
+                float.parse_peek(test.as_bytes()),
+                Ok((&b""[..], expected32))
+            );
+            assert_parse!(float.parse_peek(test), Ok(("", expected32)));
+
+            assert_parse!(
+                float.parse_peek(test.as_bytes()),
+                Ok((&b""[..], expected64))
+            );
+            assert_parse!(float.parse_peek(test), Ok(("", expected64)));
         }
 
         let remaining_exponent = "-1.234E-";