mirrors/RustPython
0
0 Fork 0
mirror of https://github.com/RustPython/RustPython.git synced 2026-10-28 18:59:04 +08:00
Code Activity

Merge pull request #4220 from charliermarsh/charlie/str-loc

Browse Source 
Start string location at kind or quote prefix
This commit is contained in:
Jeong YunWon authored and GitHub committed 2022-10-16 00:48:49 +09:00
2 parents b437aa315a ab159c98b2
commit 4be533ac60
8 files changed
+57 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

compiler/parser/src/lexer.rs
+3 -1
View File
@@ -205,7 +205,9 @@ where
// Check if we have a string:
if self.chr0 == Some('"') || self.chr0 == Some('\'') {
return self.lex_string(saw_b, saw_r, saw_u, saw_f);
return self
.lex_string(saw_b, saw_r, saw_u, saw_f)
.map(|(_, tok, end_pos)| (start_pos, tok, end_pos));
}
}
compiler/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap
Generated
+4 -4
View File
@@ -1,19 +1,19 @@
---
source: parser/src/parser.rs
source: compiler/parser/src/parser.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: JoinedStr {
@@ -21,7 +21,7 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Constant {
compiler/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap
Generated
+2 -2
View File
@@ -1,5 +1,5 @@
---
source: parser/src/string.rs
source: compiler/parser/src/string.rs
expression: parse_ast
---
[
@@ -34,7 +34,7 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 12,
column: 10,
},
custom: (),
node: FormattedValue {
compiler/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap
Generated
+30
View File
@@ -0,0 +1,30 @@
---
source: compiler/parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 1,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 1,
},
custom: (),
node: Constant {
value: Str(
"Hello, world!",
),
kind: Some(
"u",
),
},
},
},
},
]
compiler/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap
Generated
+4 -4
View File
@@ -1,19 +1,19 @@
---
source: parser/src/string.rs
source: compiler/parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: JoinedStr {
@@ -21,7 +21,7 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Constant {
compiler/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap
Generated
+4 -4
View File
@@ -1,19 +1,19 @@
---
source: parser/src/string.rs
source: compiler/parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: JoinedStr {
@@ -21,7 +21,7 @@ expression: parse_ast
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Constant {
compiler/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap
Generated
+3 -3
View File
@@ -1,19 +1,19 @@
---
source: parser/src/string.rs
source: compiler/parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
column: 1,
},
custom: (),
node: Constant {
compiler/parser/src/string.rs
+7
View File
@@ -131,4 +131,11 @@ mod tests {
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
#[test]
fn test_parse_string_triple_quotes_with_kind() {
let source = String::from("u'''Hello, world!'''");
let parse_ast = parse_program(&source, "<test>").unwrap();
insta::assert_debug_snapshot!(parse_ast);
}
}