mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-24 13:34:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4417 from harupy/add-with-offset-methods

Browse source 
Add `with_col_offset` and `with_row_offset` to `Location` for conveniece
This commit is contained in:
Jeong YunWon 2023-01-04 17:07:31 +09:00 • committed by GitHub
commit cecb205f56
4 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parser/src/error.rs
View file

@ -213,7 +213,7 @@ pub(crate) fn parse_error_from_lalrpop(
let expected = (expected.len() == 1).then(|| expected[0].clone());
ParseError {
error: ParseErrorType::UnrecognizedToken(token.1, expected),
location: Location::new(token.0.row(), token.0.column() + 1),
location: token.0.with_col_offset(1),
source_path,
}
}

8
parser/src/string_parser.rs
View file

@ -32,7 +32,7 @@ impl<'a> StringParser<'a> {
kind,
str_start,
str_end,
location: Location::new(str_start.row(), str_start.column() + offset),
location: str_start.with_col_offset(offset),
}
}
@ -519,11 +519,7 @@ impl<'a> StringParser<'a> {
fn parse_fstring_expr(source: &str, location: Location) -> Result<Expr, ParseError> {
let fstring_body = format!("({source})");
parse_expression_located(
&fstring_body,
"<fstring>",
Location::new(location.row(), location.column() - 1),
)
parse_expression_located(&fstring_body, "<fstring>", location.with_col_offset(-1))
}
pub fn parse_string(