Merge pull request #19168 from apple/revert-17668-master

Revert "[Parse] Implementation for SE-200 (raw strings)"

Author: beccadax

include/swift/AST/DiagnosticsParse.def

@@ -138,10 +138,6 @@ ERROR(lex_invalid_u_escape,none,
       "\\u{...} escape sequence expects between 1 and 8 hex digits", ())
 ERROR(lex_invalid_u_escape_rbrace,none,
       "expected '}' in \\u{...} escape sequence", ())
-ERROR(lex_invalid_escape_delimiter,none,
-      "too many '#' characters in delimited escape", ())
-ERROR(lex_invalid_closing_delimiter,none,
-      "too many '#' characters in closing delimiter", ())
 
 ERROR(lex_invalid_unicode_scalar,none,
       "invalid unicode scalar", ())

include/swift/Parse/Lexer.h

@@ -364,21 +364,19 @@ class Lexer {
     enum : char { Literal, Expr } Kind;
     // Loc+Length for the segment inside the string literal, without quotes.
     SourceLoc Loc;
-    unsigned Length, IndentToStrip, CustomDelimiterLen;
+    unsigned Length, IndentToStrip;
     bool IsFirstSegment, IsLastSegment;
 
     static StringSegment getLiteral(SourceLoc Loc, unsigned Length,
                                     bool IsFirstSegment, bool IsLastSegment,
-                                    unsigned IndentToStrip,
-                                    unsigned CustomDelimiterLen) {
+                                    unsigned IndentToStrip) {
       StringSegment Result;
       Result.Kind = Literal;
       Result.Loc = Loc;
       Result.Length = Length;
       Result.IsFirstSegment = IsFirstSegment;
       Result.IsLastSegment = IsLastSegment;
       Result.IndentToStrip = IndentToStrip;
-      Result.CustomDelimiterLen = CustomDelimiterLen;
       return Result;
     }
 
@@ -390,7 +388,6 @@ class Lexer {
       Result.IsFirstSegment = false;
       Result.IsLastSegment = false;
       Result.IndentToStrip = 0;
-      Result.CustomDelimiterLen = 0;
       return Result;
     }
 
@@ -407,14 +404,13 @@ class Lexer {
                                            SmallVectorImpl<char> &Buffer,
                                            bool IsFirstSegment = false,
                                            bool IsLastSegment = false,
-                                           unsigned IndentToStrip = 0,
-                                           unsigned CustomDelimiterLen = 0);
+                                           unsigned IndentToStrip = 0);
   StringRef getEncodedStringSegment(StringSegment Segment,
                                     SmallVectorImpl<char> &Buffer) const {
     return getEncodedStringSegment(
         StringRef(getBufferPtrForSourceLoc(Segment.Loc), Segment.Length),
         Buffer, Segment.IsFirstSegment, Segment.IsLastSegment,
-        Segment.IndentToStrip, Segment.CustomDelimiterLen);
+        Segment.IndentToStrip);
   }
 
   /// \brief Given a string literal token, separate it into string/expr segments
@@ -478,8 +474,7 @@ class Lexer {
     return diagnose(Loc, Diagnostic(DiagID, std::forward<ArgTypes>(Args)...));
   }
 
-  void formToken(tok Kind, const char *TokStart, bool IsMultilineString = false,
-                 unsigned CustomDelimiterLen = 0);
+  void formToken(tok Kind, const char *TokStart, bool MultilineString = false);
   void formEscapedIdentifierToken(const char *TokStart);
 
   /// Advance to the end of the line.
@@ -503,10 +498,10 @@ class Lexer {
   void lexTrivia(syntax::Trivia &T, bool IsForTrailingTrivia);
   static unsigned lexUnicodeEscape(const char *&CurPtr, Lexer *Diags);
 
-  unsigned lexCharacter(const char *&CurPtr, char StopQuote,
-                        bool EmitDiagnostics, bool IsMultilineString = false,
-                        unsigned CustomDelimiterLen = 0);
-  void lexStringLiteral(unsigned CustomDelimiterLen = 0);
+  unsigned lexCharacter(const char *&CurPtr,
+                        char StopQuote, bool EmitDiagnostics,
+                        bool MultilineString = false);
+  void lexStringLiteral();
   void lexEscapedIdentifier();
 
   void tryLexEditorPlaceholder();

include/swift/Parse/Token.h

@@ -45,10 +45,7 @@ class Token {
   /// Modifiers for string literals
   unsigned MultilineString : 1;
 
-  /// Length of custom delimiter of "raw" string literals
-  unsigned CustomDelimiterLen : 8;
-
-  // Padding bits == 32 - 11;
+  // Padding bits == 32 - sizeof(Kind) * 8 - 3;
 
   /// \brief The length of the comment that precedes the token.
   unsigned CommentLength;
@@ -65,8 +62,8 @@ class Token {
 public:
   Token(tok Kind, StringRef Text, unsigned CommentLength = 0)
           : Kind(Kind), AtStartOfLine(false), EscapedIdentifier(false),
-            MultilineString(false), CustomDelimiterLen(0),
-            CommentLength(CommentLength), Text(Text) {}
+            MultilineString(false), CommentLength(CommentLength),
+            Text(Text) {}
 
   Token() : Token(tok::NUM_TOKENS, {}, 0) {}
 
@@ -269,24 +266,17 @@ class Token {
 
   /// \brief Set the token to the specified kind and source range.
   void setToken(tok K, StringRef T, unsigned CommentLength = 0,
-                bool IsMultilineString = false, unsigned CustomDelimiterLen = 0) {
+                bool MultilineString = false) {
     Kind = K;
     Text = T;
     this->CommentLength = CommentLength;
     EscapedIdentifier = false;
-    this->MultilineString = IsMultilineString;
-    this->CustomDelimiterLen = CustomDelimiterLen;
-    assert(this->CustomDelimiterLen == CustomDelimiterLen &&
-           "custom string delimiter length > 255");
+    this->MultilineString = MultilineString;
   }
 
-  bool isMultilineString() const {
+  bool IsMultilineString() const {
     return MultilineString;
   }
-
-  unsigned getCustomDelimiterLen() const {
-    return CustomDelimiterLen;
-  }
 };
 
 } // end namespace swift