Skip to content

Avoid creating unused JoinedStr in FStringParser #4116

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 2 commits into from
Aug 23, 2022
Merged

Avoid creating unused JoinedStr in FStringParser #4116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0abecda
Avoid creating unused JoinedStr in FStringParser
Aug 19, 2022
5e480b8
Fix f-string regression
Aug 21, 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
56 changes: 29 additions & 27 deletions compiler/parser/src/fstring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::{
error::{FStringError, FStringErrorType, ParseError},
parser::parse_expression,
};
use itertools::Itertools;
use std::{iter, mem, str};

struct FStringParser<'a> {
Expand Down Expand Up @@ -105,19 +106,16 @@ impl<'a> FStringParser<'a> {
nested -= 1;
if nested == 0 {
formatted_value_piece.push(next);
spec_constructor.push(
self.expr(ExprKind::FormattedValue {
value: Box::new(
FStringParser::new(
&formatted_value_piece,
Location::default(),
&self.recurse_lvl + 1,
)
.parse()?,
),
conversion: ConversionFlag::None as _,
format_spec: None,
}),
let values = FStringParser::new(
&formatted_value_piece,
Location::default(),
&self.recurse_lvl + 1,
)
.parse()?;
spec_constructor.push(values
.into_iter()
.exactly_one()

@youknowone youknowone Aug 22, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I worried if this is possible to be broken, but ExpressionNestedTooDeeply seems to prevent it successfully.

.expect("Expected formatted value to produce exactly one expression.")
);
formatted_value_piece.clear();
} else {
Expand All @@ -129,11 +127,13 @@ impl<'a> FStringParser<'a> {
}
'{' => {
nested += 1;
spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(),
kind: None,
}));
constant_piece.clear();
if !constant_piece.is_empty() {
spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(),
kind: None,
}));
constant_piece.clear();
}
formatted_value_piece.push(next);
formatted_value_piece.push(' ');
}
Expand All @@ -144,11 +144,13 @@ impl<'a> FStringParser<'a> {
}
self.chars.next();
}
spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(),
kind: None,
}));
constant_piece.clear();
if !constant_piece.is_empty() {
spec_constructor.push(self.expr(ExprKind::Constant {
value: constant_piece.to_owned().into(),
kind: None,
}));
constant_piece.clear();
}
if nested > 0 {
return Err(UnclosedLbrace);
}
Expand Down Expand Up @@ -241,7 +243,7 @@ impl<'a> FStringParser<'a> {
Err(UnclosedLbrace)
}

fn parse(mut self) -> Result<Expr, FStringErrorType> {
fn parse(mut self) -> Result<Vec<Expr>, FStringErrorType> {
if self.recurse_lvl >= 2 {
return Err(ExpressionNestedTooDeeply);
}
Expand Down Expand Up @@ -287,7 +289,7 @@ impl<'a> FStringParser<'a> {
}))
}

Ok(self.expr(ExprKind::JoinedStr { values }))
Ok(values)
}
}

Expand All @@ -298,7 +300,7 @@ fn parse_fstring_expr(source: &str) -> Result<Expr, ParseError> {

/// Parse an fstring from a string, located at a certain position in the sourcecode.
/// In case of errors, we will get the location and the error returned.
pub fn parse_located_fstring(source: &str, location: Location) -> Result<Expr, FStringError> {
pub fn parse_located_fstring(source: &str, location: Location) -> Result<Vec<Expr>, FStringError> {
FStringParser::new(source, location, 0)
.parse()
.map_err(|error| FStringError { error, location })
Expand All @@ -308,7 +310,7 @@ pub fn parse_located_fstring(source: &str, location: Location) -> Result<Expr, F
mod tests {
use super::*;

fn parse_fstring(source: &str) -> Result<Expr, FStringErrorType> {
fn parse_fstring(source: &str) -> Result<Vec<Expr>, FStringErrorType> {
FStringParser::new(source, Location::default(), 0).parse()
}

Expand Down
97 changes: 44 additions & 53 deletions .../src/snapshots/rustpython_parser__fstring__tests__fstring_parse_selfdocumenting_base.snap
View file
Open in desktop

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

Loading