An implementation for 0168-multi-line-string-literals.md

include/swift/AST/DiagnosticsParse.def

@@ -125,9 +125,13 @@ ERROR(lex_invalid_u_escape_rbrace,none,
       "expected '}' in \\u{...} escape sequence", ())
 
 ERROR(lex_invalid_unicode_scalar,none,
-       "invalid unicode scalar", ())
+      "invalid unicode scalar", ())
 ERROR(lex_unicode_escape_braces,none,
       "expected hexadecimal code in braces after unicode escape", ())
+WARNING(lex_ambiguous_string_indent,none,
+        "invalid mix of multi-line string literal indentation", ())
+WARNING(lex_trailing_multiline_whitespace,none,
+        "includes trailing space characters in multi-line string literal", ())
 
 
 ERROR(lex_invalid_character,none,

include/swift/Parse/Lexer.h

@@ -375,12 +375,17 @@ class Lexer {
     // Loc+Length for the segment inside the string literal, without quotes.
     SourceLoc Loc;
     unsigned Length;
-
-    static StringSegment getLiteral(SourceLoc Loc, unsigned Length) {
+    unsigned Modifiers;
+    std::string ToReplace;
+
+    static StringSegment getLiteral(SourceLoc Loc, unsigned Length,
+                                    unsigned Modifiers, const std::string &ToReplace) {
       StringSegment Result;
       Result.Kind = Literal;
       Result.Loc = Loc;
       Result.Length = Length;
+      Result.Modifiers = Modifiers;
+      Result.ToReplace = ToReplace;
       return Result;
     }
 
@@ -397,12 +402,13 @@ class Lexer {
   /// If a copy needs to be made, it will be allocated out of the provided
   /// Buffer.
   static StringRef getEncodedStringSegment(StringRef Str,
-                                           SmallVectorImpl<char> &Buffer);
+                                           SmallVectorImpl<char> &Buffer,
+                                           unsigned Modifiers = 0, const std::string &ToReplace = "");
   StringRef getEncodedStringSegment(StringSegment Segment,
                                     SmallVectorImpl<char> &Buffer) const {
     return getEncodedStringSegment(
         StringRef(getBufferPtrForSourceLoc(Segment.Loc), Segment.Length),
-        Buffer);
+        Buffer, Segment.Modifiers, Segment.ToReplace);
   }
 
   /// \brief Given a string literal token, separate it into string/expr segments
@@ -464,7 +470,7 @@ class Lexer {
     return diagnose(Loc, Diagnostic(DiagID, std::forward<ArgTypes>(Args)...));
   }
 
-  void formToken(tok Kind, const char *TokStart);
+  void formToken(tok Kind, const char *TokStart, unsigned Modifiers = 0);
 
   /// Advance to the end of the line but leave the current buffer pointer
   /// at that newline character.
@@ -495,7 +501,7 @@ class Lexer {
   static unsigned lexUnicodeEscape(const char *&CurPtr, Lexer *Diags);
 
   unsigned lexCharacter(const char *&CurPtr,
-                        char StopQuote, bool EmitDiagnostics);
+                        char StopQuote, bool EmitDiagnostics, unsigned Modifiers = 0);
   void lexStringLiteral();
   void lexEscapedIdentifier();
 
@@ -505,6 +511,9 @@ class Lexer {
   /// Try to lex conflict markers by checking for the presence of the start and
   /// end of the marker in diff3 or Perforce style respectively.
   bool tryLexConflictMarker();
+
+  // new for multiline string literals
+  void validateIndents(const Token &Str);
 };
 
 } // end namespace swift

include/swift/Parse/Token.h

@@ -46,6 +46,9 @@ class Token {
   /// \brief Whether this token is an escaped `identifier` token.
   unsigned EscapedIdentifier : 1;
 
+  /// modifiers for string literals
+  unsigned StringModifiers: 1; // currently only one - triple quotes for long strings
+
   /// Text - The actual string covered by the token in the source buffer.
   StringRef Text;
 
@@ -60,7 +63,7 @@ class Token {
             EscapedIdentifier(false) {}
   Token(tok Kind, StringRef Text)
     : Kind(Kind), AtStartOfLine(false), CommentLength(0),
-      EscapedIdentifier(false),
+      EscapedIdentifier(false), StringModifiers(0),
       Text(Text) {}
 
   tok getKind() const { return Kind; }
@@ -273,11 +276,17 @@ class Token {
   void setText(StringRef T) { Text = T; }
 
   /// \brief Set the token to the specified kind and source range.
-  void setToken(tok K, StringRef T, unsigned CommentLength = 0) {
+  void setToken(tok K, StringRef T, unsigned CommentLength = 0, unsigned Modifiers = 0) {
     Kind = K;
     Text = T;
     this->CommentLength = CommentLength;
     EscapedIdentifier = false;
+    StringModifiers = Modifiers;
+    assert(StringModifiers == Modifiers && "Modifier overflow");
+  }
+
+  unsigned getStringModifiers() const {
+    return StringModifiers;
   }
 };