github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-05-13 03:00:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from chriseth/parse_deduplication

Browse Source 
Remove code duplication.
This commit is contained in:
chriseth
2023-02-20 17:06:11 +01:00
committed by GitHub
parent eaa49effb1 611c44b6e0
commit e7c363027f
1 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/parser/mod.rs
View File

@@ -36,61 +36,47 @@ impl<'a> ParseError<'a> {
}
pub fn parse<'a>(file_name: Option<&str>, input: &'a str) -> Result<ast::PILFile, ParseError<'a>> {
powdr::PILFileParser::new().parse(input).map_err(|err| {
let (&start, &end) = match &err {
lalrpop_util::ParseError::InvalidToken { location } => (location, location),
lalrpop_util::ParseError::UnrecognizedEOF {
location,
expected: _,
} => (location, location),
lalrpop_util::ParseError::UnrecognizedToken {
token: (start, _, end),
expected: _,
} => (start, end),
lalrpop_util::ParseError::ExtraToken {
token: (start, _, end),
} => (start, end),
lalrpop_util::ParseError::User { error: _ } => (&0, &0),
};
ParseError {
start,
end,
file_name: file_name.unwrap_or("input").to_string(),
contents: input,
message: format!("{err}"),
}
})
powdr::PILFileParser::new()
.parse(input)
.map_err(|err| handle_error(err, file_name, input))
}
pub fn parse_asm<'a>(
file_name: Option<&str>,
input: &'a str,
) -> Result<asm_ast::ASMFile, ParseError<'a>> {
powdr::ASMFileParser::new().parse(input).map_err(|err| {
// TODO code duplication
let (&start, &end) = match &err {
lalrpop_util::ParseError::InvalidToken { location } => (location, location),
lalrpop_util::ParseError::UnrecognizedEOF {
location,
expected: _,
} => (location, location),
lalrpop_util::ParseError::UnrecognizedToken {
token: (start, _, end),
expected: _,
} => (start, end),
lalrpop_util::ParseError::ExtraToken {
token: (start, _, end),
} => (start, end),
lalrpop_util::ParseError::User { error: _ } => (&0, &0),
};
ParseError {
start,
end,
file_name: file_name.unwrap_or("input").to_string(),
contents: input,
message: format!("{err}"),
}
})
powdr::ASMFileParser::new()
.parse(input)
.map_err(|err| handle_error(err, file_name, input))
}
fn handle_error<'a>(
err: lalrpop_util::ParseError<usize, lexer::Token, &str>,
file_name: Option<&str>,
input: &'a str,
) -> ParseError<'a> {
let (&start, &end) = match &err {
lalrpop_util::ParseError::InvalidToken { location } => (location, location),
lalrpop_util::ParseError::UnrecognizedEOF {
location,
expected: _,
} => (location, location),
lalrpop_util::ParseError::UnrecognizedToken {
token: (start, _, end),
expected: _,
} => (start, end),
lalrpop_util::ParseError::ExtraToken {
token: (start, _, end),
} => (start, end),
lalrpop_util::ParseError::User { error: _ } => (&0, &0),
};
ParseError {
start,
end,
file_name: file_name.unwrap_or("input").to_string(),
contents: input,
message: format!("{err}"),
}
}
#[cfg(test)]