Merge pull request swiftlang#27816 from rintaro/syntaxparse-genericrequirement

[SyntaxParse] Refactor generic requirement syntax structure

Author: rintaro

cmake/modules/SwiftHandleGybSources.cmake

@@ -121,6 +121,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/NodeSerializationCodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"

lib/Parse/ParseGeneric.cpp

@@ -274,25 +274,31 @@ ParserStatus Parser::parseGenericWhereClause(
                                       SyntaxKind::GenericRequirementList);
   bool HasNextReq;
   do {
-    SyntaxParsingContext ReqContext(SyntaxContext, SyntaxContextKind::Syntax);
+    SyntaxParsingContext ReqContext(SyntaxContext,
+                                    SyntaxKind::GenericRequirement);
+    Optional<SyntaxParsingContext> BodyContext;
+    BodyContext.emplace(SyntaxContext);
+
     // Parse the leading type. It doesn't necessarily have to be just a type
     // identifier if we're dealing with a same-type constraint.
     ParserResult<TypeRepr> FirstType = parseType();
 
     if (FirstType.hasCodeCompletion()) {
+      BodyContext->setTransparent();
       Status.setHasCodeCompletion();
       FirstTypeInComplete = true;
     }
 
     if (FirstType.isNull()) {
+      BodyContext->setTransparent();
       Status.setIsParseError();
       break;
     }
 
     if (Tok.is(tok::colon)) {
       // A conformance-requirement.
       SourceLoc ColonLoc = consumeToken();
-      ReqContext.setCreateSyntax(SyntaxKind::ConformanceRequirement);
+      BodyContext->setCreateSyntax(SyntaxKind::ConformanceRequirement);
       if (Tok.is(tok::identifier) &&
           getLayoutConstraint(Context.getIdentifier(Tok.getText()), Context)
               ->isKnownLayout()) {
@@ -332,7 +338,7 @@ ParserStatus Parser::parseGenericWhereClause(
       }
     } else if ((Tok.isAnyOperator() && Tok.getText() == "==") ||
                Tok.is(tok::equal)) {
-      ReqContext.setCreateSyntax(SyntaxKind::SameTypeRequirement);
+      BodyContext->setCreateSyntax(SyntaxKind::SameTypeRequirement);
       // A same-type-requirement
       if (Tok.is(tok::equal)) {
         diagnose(Tok, diag::requires_single_equal)
@@ -354,10 +360,12 @@ ParserStatus Parser::parseGenericWhereClause(
                                                       EqualLoc,
                                                       SecondType.get()));
     } else {
+      BodyContext->setTransparent();
       diagnose(Tok, diag::expected_requirement_delim);
       Status.setIsParseError();
       break;
     }
+    BodyContext.reset();
     HasNextReq = consumeIf(tok::comma);
     // If there's a comma, keep parsing the list.
   } while (HasNextReq);