Response to xwu's review

Author: johnno1962

include/swift/AST/DiagnosticsParse.def

@@ -139,7 +139,7 @@ ERROR(lex_invalid_u_escape,none,
 ERROR(lex_invalid_u_escape_rbrace,none,
       "expected '}' in \\u{...} escape sequence", ())
 ERROR(lex_invalid_delimiter_escape,none,
-      "too many # characters in delimited escape", ())
+      "too many '#' characters in delimited escape", ())
 ERROR(lex_zerowidth_in_string_delimiter,none,
       "zero-width character detected in string delimiter", ())
 

include/swift/Parse/Lexer.h

@@ -355,21 +355,21 @@ class Lexer {
     enum : char { Literal, Expr } Kind;
     // Loc+Length for the segment inside the string literal, without quotes.
     SourceLoc Loc;
-    unsigned Length, IndentToStrip, DelimiterLength;
+    unsigned Length, IndentToStrip, CustomDelimiterLen;
     bool IsFirstSegment, IsLastSegment;
 
     static StringSegment getLiteral(SourceLoc Loc, unsigned Length,
                                     bool IsFirstSegment, bool IsLastSegment,
                                     unsigned IndentToStrip,
-                                    unsigned DelimiterLength) {
+                                    unsigned CustomDelimiterLen) {
       StringSegment Result;
       Result.Kind = Literal;
       Result.Loc = Loc;
       Result.Length = Length;
       Result.IsFirstSegment = IsFirstSegment;
       Result.IsLastSegment = IsLastSegment;
       Result.IndentToStrip = IndentToStrip;
-      Result.DelimiterLength = DelimiterLength;
+      Result.CustomDelimiterLen = CustomDelimiterLen;
       return Result;
     }
 
@@ -381,7 +381,7 @@ class Lexer {
       Result.IsFirstSegment = false;
       Result.IsLastSegment = false;
       Result.IndentToStrip = 0;
-      Result.DelimiterLength = 0;
+      Result.CustomDelimiterLen = 0;
       return Result;
     }
 
@@ -399,13 +399,13 @@ class Lexer {
                                            bool IsFirstSegment = false,
                                            bool IsLastSegment = false,
                                            unsigned IndentToStrip = 0,
-                                           unsigned DelimiterLength = 0);
+                                           unsigned CustomDelimiterLen = 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.DelimiterLength);
+        Segment.IndentToStrip, Segment.CustomDelimiterLen);
   }
 
   /// \brief Given a string literal token, separate it into string/expr segments
@@ -469,8 +469,8 @@ class Lexer {
     return diagnose(Loc, Diagnostic(DiagID, std::forward<ArgTypes>(Args)...));
   }
 
-  void formToken(tok Kind, const char *TokStart, bool MultilineString = false,
-                 unsigned DelimiterLength = 0);
+  void formToken(tok Kind, const char *TokStart, bool IsMultilineString = false,
+                 unsigned CustomDelimiterLen = 0);
   void formEscapedIdentifierToken(const char *TokStart);
 
   /// Advance to the end of the line.
@@ -495,9 +495,9 @@ class Lexer {
   static unsigned lexUnicodeEscape(const char *&CurPtr, Lexer *Diags);
 
   unsigned lexCharacter(const char *&CurPtr, char StopQuote,
-                        bool EmitDiagnostics, bool MultilineString = false,
-                        unsigned DelimiterLength = 0);
-  void lexStringLiteral(unsigned DelimiterLength = 0);
+                        bool EmitDiagnostics, bool IsMultilineString = false,
+                        unsigned CustomDelimiterLen = 0);
+  void lexStringLiteral(unsigned CustomDelimiterLen = 0);
   void lexEscapedIdentifier();
 
   void tryLexEditorPlaceholder();

include/swift/Parse/Token.h

@@ -46,7 +46,7 @@ class Token {
   unsigned MultilineString : 1;
 
   /// Length of custom delimiter of "raw" string literals
-  unsigned StringDelimiterLength : 8;
+  unsigned CustomDelimiterLen : 8;
 
   // Padding bits == 32 - 11;
 
@@ -65,7 +65,7 @@ class Token {
 public:
   Token(tok Kind, StringRef Text, unsigned CommentLength = 0)
           : Kind(Kind), AtStartOfLine(false), EscapedIdentifier(false),
-            MultilineString(false), StringDelimiterLength(0),
+            MultilineString(false), CustomDelimiterLen(0),
             CommentLength(CommentLength), Text(Text) {}
 
   Token() : Token(tok::NUM_TOKENS, {}, 0) {}
@@ -269,22 +269,23 @@ class Token {
 
   /// \brief Set the token to the specified kind and source range.
   void setToken(tok K, StringRef T, unsigned CommentLength = 0,
-                bool MultilineString = false, unsigned DelimiterLength = 0) {
+                bool IsMultilineString = false, unsigned CustomDelimiterLen = 0) {
     Kind = K;
     Text = T;
     this->CommentLength = CommentLength;
     EscapedIdentifier = false;
-    this->MultilineString = MultilineString;
-    StringDelimiterLength = DelimiterLength;
-    assert(StringDelimiterLength == DelimiterLength && "delimiter too long");
+    this->MultilineString = IsMultilineString;
+    this->CustomDelimiterLen = CustomDelimiterLen;
+    assert(this->CustomDelimiterLen == CustomDelimiterLen &&
+           "string custom delimiter too long");
   }
 
-  bool IsMultilineString() const {
+  bool isMultilineString() const {
     return MultilineString;
   }
 
-  unsigned getDelimiterLength() const {
-    return StringDelimiterLength;
+  unsigned getCustomDelimiterLen() const {
+    return CustomDelimiterLen;
   }
 };