[Syntax] Factor out the detail for a declaration modifier.

Author: DougGregor

lib/Parse/ParseDecl.cpp

@@ -2033,13 +2033,20 @@ static AttrOptionSwitch<R>
 parseSingleAttrOption(Parser &P, SourceLoc Loc, SourceRange &AttrRange,
                       StringRef AttrName, DeclAttrKind DK) {
   bool isModifier = DeclAttribute::isDeclModifier(DK);
-  if (!P.consumeIf(tok::l_paren)) {
+  if (!P.Tok.is(tok::l_paren)) {
     AttrRange = SourceRange(Loc);
     // Create an AttrOptionSwitch with an empty value. The calls on it will
     // decide whether or not that's valid.
     return AttrOptionSwitch<R>(StringRef(), P, Loc, AttrName, isModifier);
   }
 
+  llvm::Optional<SyntaxParsingContext> ModDetailContext;
+  if (DK == DAK_ReferenceOwnership) {
+    ModDetailContext.emplace(P.SyntaxContext, SyntaxKind::DeclModifierDetail);
+  }
+
+  P.consumeToken(tok::l_paren);
+
   StringRef parsedName = P.Tok.getText();
   if (!P.consumeIf(tok::identifier)) {
     // Once we have an example of a valid option, diagnose this with
@@ -2288,7 +2295,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
       .Case("public", AccessLevel::Public)
       .Case("open", AccessLevel::Open);
 
-    if (!consumeIf(tok::l_paren)) {
+    if (!Tok.is(tok::l_paren)) {
       // Normal access control attribute.
       AttrRange = Loc;
       DuplicateAttribute = Attributes.getAttribute<AccessControlAttr>();
@@ -2297,6 +2304,11 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
       break;
     }
 
+    SyntaxParsingContext ModDetailContext(
+        SyntaxContext, SyntaxKind::DeclModifierDetail);
+
+    consumeToken(tok::l_paren);
+
     // Parse the subject.
     if (Tok.isContextualKeyword("set")) {
       consumeToken();

test/Syntax/Inputs/serialize_class_decl.json

@@ -26,8 +26,6 @@
                           "trailingTrivia": " ",
                           "presence": "Present"
                         },
-                        null,
-                        null,
                         null
                       ],
                       "presence": "Present"

test/Syntax/Inputs/serialize_distributed_actor.json

@@ -26,8 +26,6 @@
                           "trailingTrivia": " ",
                           "presence": "Present"
                         },
-                        null,
-                        null,
                         null
                       ],
                       "presence": "Present"
@@ -92,8 +90,6 @@
                                           "trailingTrivia": " ",
                                           "presence": "Present"
                                         },
-                                        null,
-                                        null,
                                         null
                                       ],
                                       "presence": "Present"

unittests/Syntax/DeclSyntaxTests.cpp

@@ -18,7 +18,8 @@ DeclModifierSyntax getCannedDeclModifier(const RC<SyntaxArena> &Arena) {
   auto LParen = Factory.makeLeftParenToken("", "");
   auto Set = Factory.makeIdentifier("set", "", "");
   auto RParen = Factory.makeRightParenToken("", "");
-  return Factory.makeDeclModifier(Private, LParen, Set, RParen);
+  return Factory.makeDeclModifier(
+      Private, Factory.makeDeclModifierDetail(LParen, Set, RParen));
 }
 
 TEST(DeclSyntaxTests, DeclModifierMakeAPIs) {
@@ -45,12 +46,13 @@ TEST(DeclSyntaxTests, DeclModifierGetAPIs) {
   auto LParen = Factory.makeLeftParenToken("", "");
   auto Set = Factory.makeIdentifier("set", "", "");
   auto RParen = Factory.makeRightParenToken("", "");
-  auto Mod = Factory.makeDeclModifier(Private, LParen, Set, RParen);
+  auto Mod = Factory.makeDeclModifier(
+      Private, Factory.makeDeclModifierDetail(LParen, Set, RParen));
 
   ASSERT_EQ(Private.getRaw(), Mod.getName().getRaw());
-  ASSERT_EQ(LParen.getRaw(), Mod.getDetailLeftParen()->getRaw());
-  ASSERT_EQ(Set.getRaw(), Mod.getDetail()->getRaw());
-  ASSERT_EQ(RParen.getRaw(), Mod.getDetailRightParen()->getRaw());
+  ASSERT_EQ(LParen.getRaw(), Mod.getDetail()->getLeftParen().getRaw());
+  ASSERT_EQ(Set.getRaw(), Mod.getDetail()->getDetail().getRaw());
+  ASSERT_EQ(RParen.getRaw(), Mod.getDetail()->getRightParen().getRaw());
 }
 
 TEST(DeclSyntaxTests, DeclModifierWithAPIs) {
@@ -65,9 +67,7 @@ TEST(DeclSyntaxTests, DeclModifierWithAPIs) {
   llvm::raw_svector_ostream OS(Scratch);
   Factory.makeBlankDeclModifier()
       .withName(Private)
-      .withDetailLeftParen(LParen)
-      .withDetail(Set)
-      .withDetailRightParen(RParen)
+      .withDetail(Factory.makeDeclModifierDetail(LParen, Set, RParen))
       .print(OS);
   ASSERT_EQ(OS.str().str(), "private(set)");
 }
@@ -509,11 +509,15 @@ ModifierListSyntax getCannedModifiers(const RC<SyntaxArena> &Arena) {
   auto NoArgument = TokenSyntax::missingToken(tok::identifier, "", Arena);
   auto NoRParen = TokenSyntax::missingToken(tok::r_paren, ")", Arena);
   auto Public =
-      Factory.makeDeclModifier(PublicID, NoLParen, NoArgument, NoRParen);
+      Factory.makeDeclModifier(
+         PublicID,
+        Factory.makeDeclModifierDetail(NoLParen, NoArgument, NoRParen));
 
   auto StaticKW = Factory.makeStaticKeyword("", " ");
   auto Static =
-      Factory.makeDeclModifier(StaticKW, NoLParen, NoArgument, NoRParen);
+      Factory.makeDeclModifier(
+        StaticKW,
+        Factory.makeDeclModifierDetail(NoLParen, NoArgument, NoRParen));
 
   return Factory.makeBlankModifierList().appending(Public).appending(Static);
 }

utils/gyb_syntax_support/DeclNodes.py

@@ -162,6 +162,14 @@
              Child('LineNumber', kind='IntegerLiteralToken'),
          ]),
 
+    Node('DeclModifierDetail', kind='Syntax',
+         traits=['Parenthesized'],
+         children=[
+             Child('LeftParen', kind='LeftParenToken'),
+             Child('Detail', kind='IdentifierToken'),
+             Child('RightParen', kind='RightParenToken'),
+         ]),
+
     Node('DeclModifier', kind='Syntax',
          children=[
              Child('Name', kind='Token', classification='Attribute',
@@ -174,9 +182,7 @@
                        'actor', 'async', 'distributed', 'isolated',
                        'nonisolated', '_const', '_local'
                    ]),
-             Child('DetailLeftParen', kind='LeftParenToken', is_optional=True),
-             Child('Detail', kind='IdentifierToken', is_optional=True),
-             Child('DetailRightParen', kind='RightParenToken', is_optional=True),
+             Child('Detail', kind='DeclModifierDetail', is_optional=True),
          ]),
 
     Node('InheritedType', kind='Syntax',
@@ -500,11 +506,7 @@
     Node('AccessLevelModifier', kind='Syntax',
          children=[
              Child('Name', kind='IdentifierToken'),
-             Child('LeftParen', kind='LeftParenToken',
-                   is_optional=True),
-             Child('Modifier', kind='IdentifierToken',
-                   is_optional=True),
-             Child('RightParen', kind='RightParenToken',
+             Child('Modifier', kind='DeclModifierDetail',
                    is_optional=True),
          ]),
 

utils/gyb_syntax_support/NodeSerializationCodes.py

@@ -240,7 +240,7 @@
     'DifferentiabilityParams': 235,
     'DifferentiabilityParamList': 236,
     'DifferentiabilityParam': 237,
-    # removed: 'DifferentiableAttributeFuncSpecifier': 238,
+    'DeclModifierDetail': 238,
     'FunctionDeclName': 239,
     'PoundFilePathExpr': 240,
     'DerivativeRegistrationAttributeArguments': 241,