Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(sol-type-parser): improve error message for bad array size #470

Merged
merged 2 commits into from
Dec 29, 2023
Merged

feat(sol-type-parser): improve error message for bad array size #470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abba3e6
feat(sol-type-parser): improve error message for bad array size
DaniPopes Dec 29, 2023
b398f01
fix: no_std
DaniPopes Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions crates/sol-type-parser/src/type_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use alloc::vec::Vec;
use core::num::NonZeroUsize;
use winnow::{
ascii::digit0,
combinator::{cut_err, delimited, opt, repeat},
combinator::{cut_err, delimited, repeat},
error::{ErrMode, ErrorKind, FromExternalError},
trace::trace,
PResult, Parser,
};
Expand Down Expand Up @@ -100,11 +101,7 @@ impl<'a> TypeSpecifier<'a> {
let sizes = if input.starts_with('[') {
repeat(
1..,
delimited(
str_parser("["),
opt(cut_err(digit0).parse_to()),
cut_err(str_parser("]")),
),
delimited(str_parser("["), array_size_parser, cut_err(str_parser("]"))),
)
.parse_next(input)?
} else {
Expand Down Expand Up @@ -142,10 +139,27 @@ impl<'a> TypeSpecifier<'a> {
}
}

fn array_size_parser(input: &mut &str) -> PResult<Option<NonZeroUsize>> {
let digits = digit0(input)?;
if digits.is_empty() {
return Ok(None);
}
digits.parse().map(Some).map_err(|e| ErrMode::from_external_error(input, ErrorKind::Verify, e))
}

#[cfg(test)]
mod test {
use super::*;
use crate::TupleSpecifier;
use alloc::string::ToString;

#[track_caller]
fn assert_error_contains(e: &Error, s: &str) {
if cfg!(feature = "std") {
let es = e.to_string();
assert!(es.contains(s), "{s:?} not in {es:?}");
}
}

#[test]
fn parse_test() {
Expand Down Expand Up @@ -245,7 +259,9 @@ mod test {
}),
);

TypeSpecifier::parse("a[0]").unwrap_err();
let e = TypeSpecifier::parse("a[0]").unwrap_err();
assert_error_contains(&e, "number would be zero for non-zero type");
TypeSpecifier::parse("a[x]").unwrap_err();

TypeSpecifier::parse("a[ ]").unwrap_err();
TypeSpecifier::parse("a[ ]").unwrap_err();
Expand All @@ -260,7 +276,8 @@ mod test {
TypeSpecifier::parse("a[1 ]").unwrap_err();

TypeSpecifier::parse(&format!("a[{}]", usize::MAX)).unwrap();
TypeSpecifier::parse(&format!("a[{}0]", usize::MAX)).unwrap_err();
let e = TypeSpecifier::parse(&format!("a[{}0]", usize::MAX)).unwrap_err();
assert_error_contains(&e, "number too large to fit in target type");
}

#[test]
Expand Down