Skip to content

refactor: extract {TestOutcome,SubtestOutcome}::parser helpers #173

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

Merged
ErichDonGubler merged 1 commit into from
Apr 8, 2025
Merged

refactor: extract {TestOutcome,SubtestOutcome}::parser helpers #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 38 additions & 25 deletions moz-webgpu-cts/src/wpt/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ use whippit::{
ParseError, SectionHeader,
},
reexport::chumsky::{
input::Emitter,
extra::ParserExtra,
input::{Emitter, Input, StrInput},
prelude::Rich,
primitive::{any, choice, end, group, just, one_of},
span::SimpleSpan,
Expand Down Expand Up @@ -1284,24 +1285,30 @@ impl Display for TestOutcome {
}
}

impl TestOutcome {
pub(crate) fn parser<'a, I, E>() -> impl Parser<'a, I, TestOutcome, E> + Clone
where
I: Input<'a, Token = char> + StrInput<'a, char>,
E: ParserExtra<'a, I>,
{
choice((
keyword(OK).to(TestOutcome::Ok),
keyword(PASS).to(TestOutcome::Pass),
keyword(FAIL).to(TestOutcome::Fail),
keyword(CRASH).to(TestOutcome::Crash),
keyword(TIMEOUT).to(TestOutcome::Timeout),
keyword(ERROR).to(TestOutcome::Error),
keyword(SKIP).to(TestOutcome::Skip),
))
}
}

impl<'a> Properties<'a> for TestProps<TestOutcome> {
type ParsedProperty = TestProp<TestOutcome>;
fn property_parser(
helper: &mut PropertiesParseHelper<'a>,
) -> Boxed<'a, 'a, &'a str, Self::ParsedProperty, ParseError<'a>> {
TestProp::property_parser(
helper,
choice((
keyword(OK).to(TestOutcome::Ok),
keyword(PASS).to(TestOutcome::Pass),
keyword(FAIL).to(TestOutcome::Fail),
keyword(CRASH).to(TestOutcome::Crash),
keyword(TIMEOUT).to(TestOutcome::Timeout),
keyword(ERROR).to(TestOutcome::Error),
keyword(SKIP).to(TestOutcome::Skip),
)),
)
.boxed()
TestProp::property_parser(helper, TestOutcome::parser()).boxed()
}

fn add_property(&mut self, prop: Self::ParsedProperty, emitter: &mut Emitter<Rich<'a, char>>) {
Expand Down Expand Up @@ -1343,22 +1350,28 @@ impl Display for SubtestOutcome {
}
}

impl SubtestOutcome {
pub(crate) fn parser<'a, I, E>() -> impl Parser<'a, I, SubtestOutcome, E> + Clone
where
I: Input<'a, Token = char> + StrInput<'a, char>,
E: ParserExtra<'a, I>,
{
choice((
keyword(PASS).to(SubtestOutcome::Pass),
keyword(FAIL).to(SubtestOutcome::Fail),
keyword(TIMEOUT).to(SubtestOutcome::Timeout),
keyword(CRASH).to(SubtestOutcome::Crash),
keyword(NOTRUN).to(SubtestOutcome::NotRun),
))
}
}

impl<'a> Properties<'a> for TestProps<SubtestOutcome> {
type ParsedProperty = TestProp<SubtestOutcome>;
fn property_parser(
helper: &mut PropertiesParseHelper<'a>,
) -> Boxed<'a, 'a, &'a str, Self::ParsedProperty, ParseError<'a>> {
TestProp::property_parser(
helper,
choice((
keyword(PASS).to(SubtestOutcome::Pass),
keyword(FAIL).to(SubtestOutcome::Fail),
keyword(TIMEOUT).to(SubtestOutcome::Timeout),
keyword(CRASH).to(SubtestOutcome::Crash),
keyword(NOTRUN).to(SubtestOutcome::NotRun),
)),
)
.boxed()
TestProp::property_parser(helper, SubtestOutcome::parser()).boxed()
}

fn add_property(&mut self, prop: Self::ParsedProperty, emitter: &mut Emitter<Rich<'a, char>>) {
Expand Down
Loading