mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-25 14:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate byteoffset ast and located ast

Browse source
This commit is contained in:
Jeong YunWon 2023-05-06 21:35:43 +09:00
parent f47dfca4e3
commit a14e43e03a
21 changed files with 893 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

20
parser/src/parser.rs
View file

@ -92,9 +92,9 @@ pub fn parse_expression(source: &str, path: &str) -> Result<ast::Expr, ParseErro
pub fn parse_expression_located(
source: &str,
path: &str,
location: TextSize,
offset: TextSize,
) -> Result<ast::Expr, ParseError> {
parse_located(source, Mode::Expression, path, location).map(|top| match top {
parse_located(source, Mode::Expression, path, offset).map(|top| match top {
ast::Mod::Expression(ast::ModExpression { body }) => *body,
_ => unreachable!(),
})
@ -161,9 +161,9 @@ pub fn parse_located(
source: &str,
mode: Mode,
source_path: &str,
location: TextSize,
offset: TextSize,
) -> Result<ast::Mod, ParseError> {
let lxr = lexer::lex_located(source, mode, location);
let lxr = lexer::lex_located(source, mode, offset);
parse_tokens(lxr, mode, source_path)
}
@ -233,17 +233,17 @@ fn parse_error_from_lalrpop(
// TODO: Are there cases where this isn't an EOF?
LalrpopError::InvalidToken { location } => ParseError {
error: ParseErrorType::Eof,
location,
offset: location,
source_path,
},
LalrpopError::ExtraToken { token } => ParseError {
error: ParseErrorType::ExtraToken(token.1),
location: token.0,
offset: token.0,
source_path,
},
LalrpopError::User { error } => ParseError {
error: ParseErrorType::Lexical(error.error),
location: error.location,
offset: error.location,
source_path,
},
LalrpopError::UnrecognizedToken { token, expected } => {
@ -252,7 +252,7 @@ fn parse_error_from_lalrpop(
let expected = (expected.len() == 1).then(|| expected[0].clone());
ParseError {
error: ParseErrorType::UnrecognizedToken(token.1, expected),
location: token.0,
offset: token.0,
source_path,
}
}
@ -262,13 +262,13 @@ fn parse_error_from_lalrpop(
if indent_error {
ParseError {
error: ParseErrorType::Lexical(LexicalErrorType::IndentationError),
location,
offset: location,
source_path,
}
} else {
ParseError {
error: ParseErrorType::Eof,
location,
offset: location,
source_path,
}
}