PEP 498 compatability: parenthesized expressions for f-strings

isidentical · isidentical · commit a382284d30f5 · 2020-11-29T17:57:49.000+03:00
diff --git a/ast/src/location.rs b/ast/src/location.rs
@@ -68,6 +68,10 @@ impl Location {
         self.column += 1;
     }
 
+    pub fn go_left(&mut self) {
+        self.column -= 1;
+    }
+
     pub fn newline(&mut self) {
         self.row += 1;
         self.column = 1;
diff --git a/parser/src/fstring.rs b/parser/src/fstring.rs
@@ -2,8 +2,8 @@ use std::iter;
 use std::mem;
 use std::str;
 
-use crate::ast::{ConversionFlag, Location, StringGroup};
-use crate::error::{FStringError, FStringErrorType};
+use crate::ast::{ConversionFlag, Expression, Location, StringGroup};
+use crate::error::{FStringError, FStringErrorType, ParseError};
 use crate::parser::parse_expression;
 
 use self::FStringErrorType::*;
@@ -117,7 +117,7 @@ impl<'a> FStringParser<'a> {
                     if nested {
                         spec = Some(Box::new(FormattedValue {
                             value: Box::new(
-                                parse_expression(spec_expression.trim())
+                                parse_fstring_expr(&spec_expression)
                                     .map_err(|e| InvalidExpression(Box::new(e.error)))?,
                             ),
                             conversion: None,
@@ -158,7 +158,7 @@ impl<'a> FStringParser<'a> {
                     if pred_expression_text.is_empty() {
                         return Ok(FormattedValue {
                             value: Box::new(
-                                parse_expression(expression.trim())
+                                parse_fstring_expr(&expression)
                                     .map_err(|e| InvalidExpression(Box::new(e.error)))?,
                             ),
                             conversion,
@@ -175,7 +175,7 @@ impl<'a> FStringParser<'a> {
                                 },
                                 FormattedValue {
                                     value: Box::new(
-                                        parse_expression(expression.trim())
+                                        parse_fstring_expr(&expression)
                                             .map_err(|e| InvalidExpression(Box::new(e.error)))?,
                                     ),
                                     conversion,
@@ -253,6 +253,13 @@ impl<'a> FStringParser<'a> {
     }
 }
 
+fn parse_fstring_expr(source: &str) -> Result<Expression, ParseError> {
+    let fstring_body = format!("({})", source);
+    let mut expression = parse_expression(&fstring_body)?;
+    expression.location.go_left();
+    Ok(expression)
+}
+
 /// Parse an f-string into a string group.
 fn parse_fstring(source: &str) -> Result<StringGroup, FStringErrorType> {
     FStringParser::new(source).parse()
@@ -297,7 +304,7 @@ mod tests {
                         spec: None,
                     },
                     FormattedValue {
-                        value: Box::new(mk_ident("b", 1, 1)),
+                        value: Box::new(mk_ident("b", 1, 2)),
                         conversion: None,
                         spec: None,
                     },
@@ -431,4 +438,11 @@ mod tests {
         let parse_ast = parse_fstring(&source);
         assert!(parse_ast.is_ok());
     }
+
+    #[test]
+    fn test_parse_fstring_yield_expr() {
+        let source = String::from("{yield}");
+        let parse_ast = parse_fstring(&source);
+        assert!(parse_ast.is_ok());
+    }
 }
