fix(ascii): Accept 0 with dec_uint/dec_int

winnow-rs · Feb 14, 2024 · c9f000a · c9f000a
1 parent 67ed881
commit c9f000a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/ascii/mod.rs b/src/ascii/mod.rs
@@ -915,7 +915,7 @@ where
     O: Uint,
 {
     trace("dec_uint", move |input: &mut I| {
-        (one_of('1'..='9'), digit0)
+        alt(((one_of('1'..='9'), digit0).void(), one_of('0').void()))
             .recognize()
             .verify_map(|s: <I as Stream>::Slice| {
                 let s = s.as_bstr();
@@ -994,7 +994,7 @@ where
             '-' => empty.value(false),
             _ => fail,
         });
-        (sign, one_of('1'..='9'), digit0)
+        alt(((sign, one_of('1'..='9'), digit0).void(), one_of('0').void()))
             .recognize()
             .verify_map(|s: <I as Stream>::Slice| {
                 let s = s.as_bstr();

diff --git a/src/ascii/tests.rs b/src/ascii/tests.rs
@@ -439,7 +439,7 @@ mod complete {
                 ErrorKind::Verify
             )))
         );
-        //assert_parse!(dec_u32(&b"0;"[..]), Ok((&b";"[..], 0)));
+        assert_parse!(dec_u32(&b"0;"[..]), Ok((&b";"[..], 0)));
         assert_parse!(dec_u32(&b"1;"[..]), Ok((&b";"[..], 1)));
         assert_parse!(dec_u32(&b"32;"[..]), Ok((&b";"[..], 32)));
         assert_parse!(
@@ -464,10 +464,16 @@ mod complete {
                 ErrorKind::Verify
             )))
         );
-        //assert_parse!(dec_i32(&b"0;"[..]), Ok((&b";"[..], 0)));
+        assert_parse!(dec_i32(&b"0;"[..]), Ok((&b";"[..], 0)));
         assert_parse!(dec_i32(&b"1;"[..]), Ok((&b";"[..], 1)));
         assert_parse!(dec_i32(&b"32;"[..]), Ok((&b";"[..], 32)));
-        //assert_parse!(dec_i32(&b"-0;"[..]), Ok((&b";"[..], 0)));
+        assert_parse!(
+            dec_i32(&b"-0;"[..]),
+            Err(ErrMode::Backtrack(error_position!(
+                &&b"-0;"[..],
+                ErrorKind::Verify
+            )))
+        );
         assert_parse!(dec_i32(&b"-1;"[..]), Ok((&b";"[..], -1)));
         assert_parse!(dec_i32(&b"-32;"[..]), Ok((&b";"[..], -32)));
         assert_parse!(