[NFC] Add tok::colon_colon to parser

Author: beccadax

include/swift/AST/TokenKinds.def

@@ -203,6 +203,7 @@ PUNCTUATOR(period_prefix, ".")
 PUNCTUATOR(comma, ",")
 PUNCTUATOR(ellipsis, "...")
 PUNCTUATOR(colon, ":")
+PUNCTUATOR(colon_colon, "::")
 PUNCTUATOR(semi, ";")
 PUNCTUATOR(equal, "=")
 PUNCTUATOR(at_sign, "@")

include/swift/Parse/Parser.h

@@ -763,6 +763,17 @@ class Parser {
   consumeStartingCharacterOfCurrentToken(tok Kind = tok::oper_binary_unspaced,
                                          size_t Len = 1);
 
+  /// If the next token is \c tok::colon, consume it; if the next token is
+  /// \c tok::colon_colon, split it into two \c tok::colons and consume the
+  /// first; otherwise, do nothing and return false.
+  bool consumeIfColonSplittingDoubles() {
+    if (!Tok.isAny(tok::colon, tok::colon_colon))
+      return false;
+
+    consumeStartingCharacterOfCurrentToken(tok::colon);
+    return true;
+  }
+
   //===--------------------------------------------------------------------===//
   // Primitive Parsing
 

lib/Parse/Lexer.cpp

@@ -2762,9 +2762,15 @@ void Lexer::lexImpl() {
 
   case ',': return formToken(tok::comma, TokStart);
   case ';': return formToken(tok::semi, TokStart);
-  case ':': return formToken(tok::colon, TokStart);
   case '\\': return formToken(tok::backslash, TokStart);
 
+  case ':':
+    if (CurPtr[0] == ':') {
+      CurPtr++;
+      return formToken(tok::colon_colon, TokStart);
+    }
+    return formToken(tok::colon, TokStart);
+
   case '#': {
     // Try lex a raw string literal.
     auto *Diags = getTokenDiags();

lib/Parse/ParseDecl.cpp

@@ -1808,11 +1808,10 @@ void Parser::parseObjCSelector(SmallVector<Identifier, 4> &Names,
   IsNullarySelector = true;
   while (true) {
     // Empty selector piece.
-    if (Tok.is(tok::colon)) {
+    if (consumeIfColonSplittingDoubles()) {
       Names.push_back(Identifier());
-      NameLocs.push_back(Tok.getLoc());
+      NameLocs.push_back(PreviousLoc);
       IsNullarySelector = false;
-      consumeToken();
       continue;
     }
 
@@ -1823,8 +1822,7 @@ void Parser::parseObjCSelector(SmallVector<Identifier, 4> &Names,
       consumeToken();
 
       // If we have a colon, consume it.
-      if (Tok.is(tok::colon)) {
-        consumeToken();
+      if (consumeIfColonSplittingDoubles()) {
         IsNullarySelector = false;
         continue;
       }

lib/Parse/ParseExpr.cpp

@@ -2142,14 +2142,29 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
                                       AppendingExpr));
 }
 
+/// Equivalent to \c Tok.is(tok::colon), but pretends that \c tok::colon_colon
+/// doesn't exist if \c EnableExperimentalModuleSelector is disabled.
+static bool isColon(Parser &P, Token Tok, tok altColon = tok::NUM_TOKENS) {
+  // FIXME: Introducing tok::colon_colon broke diag::empty_arg_label_underscore.
+  // We only care about tok::colon_colon when module selectors are turned on, so
+  // when they are turned off, this function works around the bug by treating
+  // tok::colon_colon as a synonym for tok::colon. However, the bug still exists
+  // when Feature::ModuleSelector is enabled. We will need to address this
+  // before the feature can be released.
+
+  if (P.Context.LangOpts.hasFeature(Feature::ModuleSelector))
+    return Tok.isAny(tok::colon, altColon);
+
+  return Tok.isAny(tok::colon, tok::colon_colon, altColon);
+}
+
 void Parser::parseOptionalArgumentLabel(Identifier &name, SourceLoc &loc,
                                         bool isAttr) {
   /// A token that has the same meaning as colon, but is deprecated, if one exists for this call.
   auto altColon = isAttr ? tok::equal : tok::NUM_TOKENS;
 
   // Check to see if there is an argument label.
-  if (Tok.canBeArgumentLabel() && peekToken().isAny(tok::colon, altColon)) {
-    // Label found, including colon.
+  if (Tok.canBeArgumentLabel() && isColon(*this, peekToken(), altColon)) {
     auto text = Tok.getText();
 
     // If this was an escaped identifier that need not have been escaped, say
@@ -2168,7 +2183,7 @@ void Parser::parseOptionalArgumentLabel(Identifier &name, SourceLoc &loc,
     }
 
     loc = consumeArgumentLabel(name, /*diagnoseDollarPrefix=*/false);
-  } else if (Tok.isAny(tok::colon, altColon)) {
+  } else if (isColon(*this, Tok, altColon)) {
     // Found only the colon.
     diagnose(Tok, diag::expected_label_before_colon)
       .fixItInsert(Tok.getLoc(), "<#label#>");
@@ -2178,7 +2193,12 @@ void Parser::parseOptionalArgumentLabel(Identifier &name, SourceLoc &loc,
   }
 
   // If we get here, we ought to be on the colon.
-  assert(Tok.isAny(tok::colon, altColon));
+  ASSERT(Tok.isAny(tok::colon, tok::colon_colon, altColon));
+
+  if (Tok.is(tok::colon_colon)) {
+    consumeIfColonSplittingDoubles();
+    return;
+  }
 
   if (Tok.is(altColon))
     diagnose(Tok, diag::replace_equal_with_colon_for_value)
@@ -2208,7 +2228,7 @@ static bool tryParseArgLabelList(Parser &P, Parser::DeclNameOptions flags,
       flags.contains(Parser::DeclNameFlag::AllowZeroArgCompoundNames) &&
       next.is(tok::r_paren);
   // An argument label.
-  bool nextIsArgLabel = next.canBeArgumentLabel() || next.is(tok::colon);
+  bool nextIsArgLabel = next.canBeArgumentLabel() || isColon(P, next);
   // An editor placeholder.
   bool nextIsPlaceholder = next.isEditorPlaceholder();
 
@@ -2221,11 +2241,11 @@ static bool tryParseArgLabelList(Parser &P, Parser::DeclNameOptions flags,
   lparenLoc = P.consumeToken(tok::l_paren);
   while (P.Tok.isNot(tok::r_paren)) {
     // If we see a ':', the user forgot the '_';
-    if (P.Tok.is(tok::colon)) {
-      P.diagnose(P.Tok, diag::empty_arg_label_underscore)
-          .fixItInsert(P.Tok.getLoc(), "_");
+    if (P.consumeIfColonSplittingDoubles()) {
+      P.diagnose(P.PreviousLoc, diag::empty_arg_label_underscore)
+          .fixItInsert(P.PreviousLoc, "_");
       argumentLabels.push_back(Identifier());
-      argumentLabelLocs.push_back(P.consumeToken(tok::colon));
+      argumentLabelLocs.push_back(P.PreviousLoc);
     }
 
     Identifier argName;