Consolidate StringInterpolationExpr to StringLiteralExpr

Author: kitasuke

lib/Parse/ParseExpr.cpp

@@ -2003,16 +2003,6 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
   SourceLoc Loc = Tok.getLoc();
   SourceLoc EndLoc = Loc.getAdvancedLoc(Tok.getLength());
 
-  // The simple case: just a single literal segment.
-  if (Segments.size() == 1 &&
-      Segments.front().Kind == Lexer::StringSegment::Literal) {
-    consumeToken();
-    return makeParserResult(
-        createStringLiteralExprFromSegment(Context, L, Segments.front(), Loc));
-  }
-
-  // We are now sure this is a string interpolation expression.
-  LocalContext.setCreateSyntax(SyntaxKind::StringInterpolationExpr);
   StringRef OpenQuoteStr, CloseQuoteStr;
   tok QuoteKind;
   std::tie(OpenQuoteStr, CloseQuoteStr, QuoteKind) = Tok.isMultilineString() ?

lib/Syntax/Status.md

@@ -31,7 +31,6 @@
   * ForcedValueExpr
   * SuperRefExpr
   * ImplicitMemberExpr
-  * InterpolatedStringLiteralExpr
   * KeyPathExpr
   * KeyPathDotExpr
   * InOutExpr

test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -26,7 +26,7 @@ class C <MemberDeclBlock>{<MemberDeclListItem><FunctionDecl>
   func bar3<FunctionSignature><ParameterClause>(<FunctionParameter>a: <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <SimpleTypeIdentifier>Int </SimpleTypeIdentifier></ReturnClause></FunctionSignature><CodeBlock>{ <ReturnStmt>return <IntegerLiteralExpr>1 </IntegerLiteralExpr></ReturnStmt>}</CodeBlock></FunctionDecl></MemberDeclListItem><MemberDeclListItem><FunctionDecl>
   func bar4<FunctionSignature><ParameterClause>(<FunctionParameter>_ a: <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <SimpleTypeIdentifier>Int </SimpleTypeIdentifier></ReturnClause></FunctionSignature><CodeBlock>{ <ReturnStmt>return <IntegerLiteralExpr>1 </IntegerLiteralExpr></ReturnStmt>}</CodeBlock></FunctionDecl></MemberDeclListItem><MemberDeclListItem><FunctionDecl>
   func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<VariableDecl>
-    var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringInterpolationExpr>/*comment*/"<StringSegment>ab</StringSegment><ExpressionSegment>\(<FunctionCallArgument><IdentifierExpr>x</IdentifierExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>c</StringSegment>"</StringInterpolationExpr></InitializerClause></PatternBinding></VariableDecl><VariableDecl>/*comment*/
+    var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringLiteralExpr>/*comment*/"<StringSegment>ab</StringSegment><ExpressionSegment>\(<FunctionCallArgument><IdentifierExpr>x</IdentifierExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>c</StringSegment>"</StringLiteralExpr></InitializerClause></PatternBinding></VariableDecl><VariableDecl>/*comment*/
     var <PatternBinding><IdentifierPattern>b </IdentifierPattern><InitializerClause>= <PrefixOperatorExpr>/*comment*/+<IntegerLiteralExpr>2</IntegerLiteralExpr></PrefixOperatorExpr></InitializerClause></PatternBinding></VariableDecl><FunctionCallExpr><IdentifierExpr>/*comment*/
     bar</IdentifierExpr>(<FunctionCallArgument><IntegerLiteralExpr>1</IntegerLiteralExpr></FunctionCallArgument>)</FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
     bar</IdentifierExpr>(<FunctionCallArgument><PrefixOperatorExpr>+<IntegerLiteralExpr>10</IntegerLiteralExpr></PrefixOperatorExpr></FunctionCallArgument>)</FunctionCallExpr><FunctionCallExpr><IdentifierExpr>
@@ -434,13 +434,13 @@ extension <SimpleTypeIdentifier>ext </SimpleTypeIdentifier><GenericWhereClause>w
 extension <MemberTypeIdentifier><MemberTypeIdentifier><SimpleTypeIdentifier>ext</SimpleTypeIdentifier>.a</MemberTypeIdentifier>.b </MemberTypeIdentifier><MemberDeclBlock>{}</MemberDeclBlock></ExtensionDecl><FunctionDecl>
 
 func foo<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<VariableDecl>
-  var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringInterpolationExpr>"<StringSegment>abc </StringSegment><ExpressionSegment>\(<FunctionCallArgument><FunctionCallExpr><IdentifierExpr>foo</IdentifierExpr>()</FunctionCallExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> def </StringSegment><ExpressionSegment>\(<FunctionCallArgument><SequenceExpr><IdentifierExpr>a </IdentifierExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><IdentifierExpr>b </IdentifierExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><StringInterpolationExpr>"<StringSegment>a </StringSegment><ExpressionSegment>\(<FunctionCallArgument><IntegerLiteralExpr>3</IntegerLiteralExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment></StringSegment>"</StringInterpolationExpr></SequenceExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> gh </StringSegment><ExpressionSegment>\(<FunctionCallArgument><IdentifierExpr>bar</IdentifierExpr>, </FunctionCallArgument><FunctionCallArgument>default: <IntegerLiteralExpr>1</IntegerLiteralExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment></StringSegment>"</StringInterpolationExpr></InitializerClause></PatternBinding></VariableDecl><VariableDecl>
-  var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringInterpolationExpr>"""<StringSegment>
+  var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringLiteralExpr>"<StringSegment>abc </StringSegment><ExpressionSegment>\(<FunctionCallArgument><FunctionCallExpr><IdentifierExpr>foo</IdentifierExpr>()</FunctionCallExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> def </StringSegment><ExpressionSegment>\(<FunctionCallArgument><SequenceExpr><IdentifierExpr>a </IdentifierExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><IdentifierExpr>b </IdentifierExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><StringLiteralExpr>"<StringSegment>a </StringSegment><ExpressionSegment>\(<FunctionCallArgument><IntegerLiteralExpr>3</IntegerLiteralExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment></StringSegment>"</StringLiteralExpr></SequenceExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> gh </StringSegment><ExpressionSegment>\(<FunctionCallArgument><IdentifierExpr>bar</IdentifierExpr>, </FunctionCallArgument><FunctionCallArgument>default: <IntegerLiteralExpr>1</IntegerLiteralExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment></StringSegment>"</StringLiteralExpr></InitializerClause></PatternBinding></VariableDecl><VariableDecl>
+  var <PatternBinding><IdentifierPattern>a </IdentifierPattern><InitializerClause>= <StringLiteralExpr>"""<StringSegment>
   abc </StringSegment><ExpressionSegment>\( <FunctionCallArgument><SequenceExpr><FunctionCallExpr><IdentifierExpr>foo</IdentifierExpr>() </FunctionCallExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><FunctionCallExpr><IdentifierExpr>bar</IdentifierExpr>() </FunctionCallExpr></SequenceExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>
-  de </StringSegment><ExpressionSegment>\(<FunctionCallArgument><SequenceExpr><IntegerLiteralExpr>3 </IntegerLiteralExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><IntegerLiteralExpr>3 </IntegerLiteralExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><StringInterpolationExpr>"<StringSegment>abc </StringSegment><ExpressionSegment>\(<FunctionCallArgument><FunctionCallExpr><IdentifierExpr>foo</IdentifierExpr>()</FunctionCallExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> def</StringSegment>"</StringInterpolationExpr></SequenceExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>
+  de </StringSegment><ExpressionSegment>\(<FunctionCallArgument><SequenceExpr><IntegerLiteralExpr>3 </IntegerLiteralExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><IntegerLiteralExpr>3 </IntegerLiteralExpr><BinaryOperatorExpr>+ </BinaryOperatorExpr><StringLiteralExpr>"<StringSegment>abc </StringSegment><ExpressionSegment>\(<FunctionCallArgument><FunctionCallExpr><IdentifierExpr>foo</IdentifierExpr>()</FunctionCallExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment> def</StringSegment>"</StringLiteralExpr></SequenceExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>
   fg
   </StringSegment><ExpressionSegment>\(<FunctionCallArgument><IdentifierExpr>bar</IdentifierExpr>, </FunctionCallArgument><FunctionCallArgument>default: <IntegerLiteralExpr>1</IntegerLiteralExpr></FunctionCallArgument>)</ExpressionSegment><StringSegment>
-  </StringSegment>"""</StringInterpolationExpr></InitializerClause></PatternBinding></VariableDecl>
+  </StringSegment>"""</StringLiteralExpr></InitializerClause></PatternBinding></VariableDecl>
 }</CodeBlock></FunctionDecl><FunctionDecl>
 
 func keypath<FunctionSignature><ParameterClause>() </ParameterClause></FunctionSignature><CodeBlock>{<SequenceExpr><DiscardAssignmentExpr>

utils/gyb_syntax_support/ExprNodes.py

@@ -267,11 +267,6 @@
              Child('Digits', kind='IntegerLiteralToken'),
          ]),
 
-    Node('StringLiteralExpr', kind='Expr',
-         children=[
-             Child("StringLiteral", kind='StringLiteralToken')
-         ]),
-
     # true or false
     Node('BooleanLiteralExpr', kind='Expr',
          children=[
@@ -476,7 +471,7 @@
          ]),
 
     # e.g. "abc \(foo()) def"
-    Node('StringInterpolationExpr', kind='Expr',
+    Node('StringLiteralExpr', kind='Expr',
          children=[
              Child('OpenQuote', kind='Token',
                    token_choices=[

utils/gyb_syntax_support/NodeSerializationCodes.py

@@ -66,7 +66,6 @@
     'ForcedValueExpr': 61,
     'PostfixUnaryExpr': 62,
     'SpecializeExpr': 63,
-    'StringInterpolationExpr': 64,
     'KeyPathExpr': 65,
     'KeyPathBaseExpr': 66,
     'ObjcKeyPathExpr': 67,