Skip to content

Support expression in f-strings spec #1625

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
coolreader18 merged 5 commits into from
Dec 28, 2019
Merged

Support expression in f-strings spec #1625

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3703f0
Support expression in f-strings spec
palaviv Dec 13, 2019
8e84a85
Add more tests for nested f-string spec
palaviv Dec 14, 2019
b394ad4
Parse FormattedValue spec in symboltable
palaviv Dec 21, 2019
6698fde
Add TODO for spec validation
palaviv Dec 21, 2019
6a4c3da
Fix clippy warning
palaviv Dec 27, 2019
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
Prev Previous commit
Next Next commit
Add more tests for nested f-string spec
  • Loading branch information
@palaviv
palaviv committed Dec 27, 2019
commit 8e84a85b0ceeb244f0b8c29b63353c55a2f966cd
12 changes: 7 additions & 5 deletions parser/src/fstring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@ impl<'a> FStringParser<'a> {
'{' => {
if in_nested {
return Err(ExpressionNestedTooDeeply);
} else {
in_nested = true;
nested = true;
self.chars.next();
continue;
}
in_nested = true;
nested = true;
self.chars.next();
continue;
}
'}' => {
if in_nested {
Expand Down Expand Up @@ -295,6 +294,9 @@ mod tests {
fn test_parse_invalid_fstring() {
assert_eq!(parse_fstring("{"), Err(UnclosedLbrace));
assert_eq!(parse_fstring("}"), Err(UnopenedRbrace));
assert_eq!(parse_fstring("{a:{a:{b}}"), Err(ExpressionNestedTooDeeply));
assert_eq!(parse_fstring("{a:b}}"), Err(UnopenedRbrace));
assert_eq!(parse_fstring("{a:{b}"), Err(UnclosedLbrace));

// TODO: check for InvalidExpression enum?
assert!(parse_fstring("{class}").is_err());
Expand Down