Skip to content

Implement CPython-like implicit string concatenation in parser #4097

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
youknowone merged 12 commits into from
Aug 21, 2022
Merged

Implement CPython-like implicit string concatenation in parser #4097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8b45dee
Implement CPython-like implicit string concatenation in parser
Aug 17, 2022
e32959a
Add three-part test
Aug 18, 2022
9502bae
Move more logic into parse_implicit_concatenation
Aug 18, 2022
728614e
Remove extern crate
Aug 18, 2022
2ff3d0f
Reorder tests
Aug 18, 2022
e9907d4
Remove newline
Aug 18, 2022
07a4332
Remove unused import
Aug 19, 2022
4878848
Move Ok
Aug 19, 2022
0d0f5a2
Remove one match; sort Cargo.toml
Aug 19, 2022
7c377ca
Rename parse_strings
Aug 19, 2022
853da19
fix style
youknowone Aug 20, 2022
f12082c
refactoring
youknowone Aug 20, 2022
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,23 @@ license = "MIT"
edition = "2021"

[build-dependencies]
tiny-keccak = { version = "2", features = ["sha3"] }
phf_codegen = "0.10"
lalrpop = { version = "0.19.8", optional = true }
anyhow = "1.0.45"
lalrpop = { version = "0.19.8", optional = true }
phf_codegen = "0.10"
tiny-keccak = { version = "2", features = ["sha3"] }

[dependencies]
rustpython-ast = { path = "../ast" }
ahash = "0.7.6"
itertools = "0.10.3"
lalrpop-util = "0.19.8"
log = "0.4.16"
num-bigint = "0.4.3"
num-traits = "0.2.14"
phf = "0.10.1"
rustpython-ast = { path = "../ast" }
unic-emoji-char = "0.9.0"
unic-ucd-ident = "0.9.0"
unicode_names2 = "0.5.0"
phf = "0.10.1"
ahash = "0.7.6"
Comment thread
youknowone marked this conversation as resolved.
Resolved

[dev-dependencies]
insta = "1.14.0"
23 changes: 2 additions & 21 deletions parser/python.lalrpop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
use crate::{
ast,
error::{LexicalError, LexicalErrorType},
fstring::parse_located_fstring,
function::{ArgumentList, parse_args, parse_params},
lexer,
string::parse_strings,
token::StringKind
};
use num_bigint::BigInt;
Expand Down Expand Up @@ -961,26 +961,7 @@ SliceOp: Option<ast::Expr> = {
}

Atom: ast::Expr = {
<location:@L> <s:(@L string)+> =>? {
let values = s.into_iter().map(|(loc, (value, kind))| {
if let StringKind::F = kind {
parse_located_fstring(&value, loc)
} else {
let kind = (kind == StringKind::U).then(|| "u".to_owned());
Ok(ast::Expr::new(
loc,
ast::ExprKind::Constant { value: value.into(), kind },
))
}
});
let values = values.collect::<Result<Vec<_>, _>>()?;

Ok(if values.len() > 1 {
ast::Expr::new(location, ast::ExprKind::JoinedStr { values })
} else {
values.into_iter().next().unwrap()
})
},
<location:@L> <s:(@L string)+> =>? parse_strings(s).map_err(|e| e.into()),
<location:@L> <value:Constant> => ast::Expr {
location,
custom: (),
Expand Down
1 change: 1 addition & 0 deletions parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ pub mod mode;
pub mod parser;
#[rustfmt::skip]
mod python;
mod string;
pub mod token;
14 changes: 14 additions & 0 deletions parser/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,20 @@ mod tests {
insta::assert_debug_snapshot!(parse_ast);
}

#[test]
fn test_parse_string() {
let source = String::from("'Hello world'");
let parse_ast = parse_program(&source).unwrap();
insta::assert_debug_snapshot!(parse_ast);
}

#[test]
fn test_parse_f_string() {
let source = String::from("f'Hello world'");
let parse_ast = parse_program(&source).unwrap();
insta::assert_debug_snapshot!(parse_ast);
}

#[test]
fn test_parse_print_hello() {
let source = String::from("print('Hello world')");
Expand Down
39 changes: 39 additions & 0 deletions parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
source: parser/src/parser.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: JoinedStr {
values: [
Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
],
},
},
},
},
]
28 changes: 28 additions & 0 deletions parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
source: parser/src/parser.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
},
},
]
39 changes: 39 additions & 0 deletions parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
source: parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: JoinedStr {
values: [
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
],
},
},
},
},
]
39 changes: 39 additions & 0 deletions parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
source: parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: JoinedStr {
values: [
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
],
},
},
},
},
]
63 changes: 63 additions & 0 deletions parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
source: parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: JoinedStr {
values: [
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
Located {
location: Location {
row: 1,
column: 12,
},
custom: (),
node: FormattedValue {
value: Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: Constant {
value: Str(
"!",
),
kind: None,
},
},
conversion: 0,
format_spec: None,
},
},
],
},
},
},
},
]
28 changes: 28 additions & 0 deletions parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
source: parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 2,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: None,
},
},
},
},
]
41 changes: 41 additions & 0 deletions parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
source: parser/src/string.rs
expression: parse_ast
---
[
Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: Expr {
value: Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: JoinedStr {
values: [
Located {
location: Location {
row: 1,
column: 3,
},
custom: (),
node: Constant {
value: Str(
"Hello world",
),
kind: Some(
"u",
),
},
},
],
},
},
},
},
]
Loading