Minor changes for better clarity

Author: mateusrodriguesxyz

lib/Parse/ParseDecl.cpp

@@ -6798,12 +6798,12 @@ ParserStatus Parser::parseInheritance(
 
   ParserStatus Status;
   SourceLoc prevComma;
-  bool HasNextType;
+  bool HasComma;
   bool IsEndOfList;
   do {
     SWIFT_DEFER {
       // Check for a ',', which indicates that there are more protocols coming.
-      HasNextType = consumeIf(tok::comma, prevComma);
+      HasComma = consumeIf(tok::comma, prevComma);
       IsEndOfList = (Context.LangOpts.hasFeature(Feature::TrailingComma) &&
                      (Tok.is(tok::l_brace) || Tok.is(tok::kw_where)));
     };
@@ -6857,7 +6857,7 @@ ParserStatus Parser::parseInheritance(
     // Record the type if its a single type.
     if (ParsedTypeResult.isNonNull())
       Inherited.push_back(InheritedEntry(ParsedTypeResult.get()));
-  } while (HasNextType && !IsEndOfList);
+  } while (HasComma && !IsEndOfList);
 
   return Status;
 }

lib/Parse/ParseExpr.cpp

@@ -1926,6 +1926,8 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
   default:
   UnknownCharacter:
     checkForInputIncomplete();
+    // Enable trailing comma in string literal interpolation
+    // Note that 'Tok.is(tok::r_paren)' is not used because the text is ")\"\n" but the kind is actualy 'eof'
     if (Tok.is(tok::eof) && Tok.getText() == ")") {
       return nullptr;
     }

lib/Parse/ParseGeneric.cpp

@@ -47,7 +47,7 @@ ParserStatus
 Parser::parseGenericParametersBeforeWhere(SourceLoc LAngleLoc,
                         SmallVectorImpl<GenericTypeParamDecl *> &GenericParams) {
   ParserStatus Result;
-  bool HasNextParam{};
+  bool HasComma{};
   bool IsEndOfList;
   do {
     // Note that we're parsing a declaration.
@@ -133,9 +133,9 @@ Parser::parseGenericParametersBeforeWhere(SourceLoc LAngleLoc,
     Param->getAttrs() = attributes;
 
     // Parse the comma, if the list continues.
-    HasNextParam = consumeIf(tok::comma);
+    HasComma = consumeIf(tok::comma);
     IsEndOfList = startsWithGreater(Tok);
-  } while (HasNextParam && !IsEndOfList);
+  } while (HasComma && !IsEndOfList);
 
   return Result;
 }
@@ -278,7 +278,7 @@ ParserStatus Parser::parseGenericWhereClause(
   ParserStatus Status;
   // Parse the 'where'.
   WhereLoc = consumeToken(tok::kw_where);
-  bool HasNextReq;
+  bool HasComma;
   bool IsEndOfList;
   do {
     if (Tok.is(tok::code_complete)) {
@@ -404,18 +404,18 @@ ParserStatus Parser::parseGenericWhereClause(
       Status.setIsParseError();
       break;
     }
-    HasNextReq = consumeIf(tok::comma);
+    HasComma = consumeIf(tok::comma);
     IsEndOfList = (Context.LangOpts.hasFeature(Feature::TrailingComma) &&
                    Tok.is(tok::l_brace));
     // If there's a comma, keep parsing the list.
     // If there's a "&&", diagnose replace with a comma and keep parsing
-    if (Tok.isBinaryOperator() && Tok.getText() == "&&" && !HasNextReq) {
+    if (Tok.isBinaryOperator() && Tok.getText() == "&&" && !HasComma) {
       diagnose(Tok, diag::requires_comma)
         .fixItReplace(SourceRange(Tok.getLoc()), ",");
       consumeToken();
-      HasNextReq = true;
+      HasComma = true;
     }
-  } while (HasNextReq && !IsEndOfList);
+  } while (HasComma && !IsEndOfList);
 
   if (!Requirements.empty())
     EndLoc = Requirements.back().getSourceRange().End;

lib/Parse/ParseStmt.cpp

@@ -1522,8 +1522,8 @@ Parser::parseAvailabilitySpecList(SmallVectorImpl<AvailabilitySpec *> &Specs,
       consumeToken();
       Status.setIsParseError();
     } else if (consumeIf(tok::comma)) {
-      // End of list with a trailing comma.
-      if (Source != AvailabilitySpecSource::Available && Tok.is(tok::r_paren)) {
+      // End of unavailable spec list with a trailing comma.
+      if (Source == AvailabilitySpecSource::Unavailable && Tok.is(tok::r_paren)) {
         break;
       }
       // There is more to parse in this list.