Response to rintaro's 2nd review

Author: johnno1962

lib/Parse/Lexer.cpp

@@ -1411,8 +1411,9 @@ static const char *skipToEndOfInterpolatedExpression(const char *CurPtr,
     case '"':
     case '\'': {
       if (!AllowNewline.back() && inStringLiteral()) {
-        if (OpenDelimiters.back() == CurPtr[-1] &&
-            delimiterMatches(CustomDelimiter.back(), CurPtr)) {
+        unsigned InnerDelimiter = CustomDelimiter.back();
+        if (OpenDelimiters.back() == CurPtr[-1] && (!InnerDelimiter ||
+             (delimiterMatches(InnerDelimiter, CurPtr) && *CurPtr != '#'))) {
           // Closing single line string literal.
           OpenDelimiters.pop_back();
           AllowNewline.pop_back();
@@ -1800,7 +1801,8 @@ void Lexer::lexStringLiteral(unsigned DelimiterLength) {
       }
 
       // Is this the end of multiline/delimited string literal?
-      if (StringRef(CurPtr, BufferEnd - CurPtr).startswith(ExtraTermination)) {
+      if (StringRef(CurPtr, BufferEnd - CurPtr).startswith(ExtraTermination) &&
+          (!DelimiterLength || *(CurPtr + ExtraTermination.size()) != '#')) {
         TokStart -= DelimiterLength;
         CurPtr += ExtraTermination.size();
         if (wasErroneous)

test/Parse/raw_string.swift

@@ -49,6 +49,15 @@ _ = ##"""
   """##
 // CHECK: "print(\"\"\"\n  Five\n\n\nEpsilon\n  \"\"\")"
 
+_ = #" "##" "#
+// CHECK: " \"##\" "
+
+_ = #" \#(#" "######" "#) "#
+// CHECK: " \"######\" "
+
+_ = #" \#(##"###""###"##) "#
+// CHECK: "###\"\"###"
+
 // ===---------- Single line --------===
 
 _ = #""Zeta""#

test/Parse/raw_string_errors.swift

@@ -0,0 +1,10 @@
+// RUN: %target-typecheck-verify-swift
+
+#"\##("invalid")"#
+// expected-error@-1{{Too many # characters in delimited escape}}
+
+####"invalid"###
+// expected-error@-1{{unterminated string literal}}
+
+###"invalid"####
+// expected-error@-1{{unterminated string literal}}