Merge pull request #63283 from hborla/member-macro-parse-decl-options

[Parser] Use proper `ParseDeclOptions` when parsing the result of a member macro expansion.

Author: hborla

include/swift/AST/DiagnosticsParse.def

@@ -2049,6 +2049,9 @@ WARNING(macro_expression_attribute_removed,PointsToFirstBadToken,
 ERROR(unexpected_attribute_expansion,PointsToFirstBadToken,
       "unexpected token '%0' in expanded attribute list'",
       (StringRef))
+ERROR(unexpected_member_expansion,PointsToFirstBadToken,
+      "unexpected token '%0' in expanded member list'",
+      (StringRef))
 
 ERROR(parser_round_trip_error,none,
       "source file did not round-trip through the new Swift parser", ())

include/swift/Parse/Parser.h

@@ -1235,6 +1235,10 @@ class Parser {
   /// the attribute list attached.
   void parseExpandedAttributeList(SmallVectorImpl<ASTNode> &items);
 
+  /// Parse the result of member macro expansion, which is a floating
+  /// member list.
+  void parseExpandedMemberList(SmallVectorImpl<ASTNode> &items);
+
   ParserResult<FuncDecl> parseDeclFunc(SourceLoc StaticLoc,
                                        StaticSpellingKind StaticSpelling,
                                        ParseDeclOptions Flags,

lib/Parse/ParseDecl.cpp

@@ -7098,6 +7098,31 @@ void Parser::parseExpandedAttributeList(SmallVectorImpl<ASTNode> &items) {
   return;
 }
 
+void Parser::parseExpandedMemberList(SmallVectorImpl<ASTNode> &items) {
+  Optional<DiagnosticTransaction> transaction;
+  parseSourceFileViaASTGen(items, transaction, /*suppressDiagnostics*/true);
+
+  if (Tok.is(tok::NUM_TOKENS))
+    consumeTokenWithoutFeedingReceiver();
+
+  auto *decl = CurDeclContext->getAsDecl();
+  auto *idc = dyn_cast<IterableDeclContext>(decl);
+  bool previousHadSemi = true;
+
+  while (!Tok.is(tok::eof)) {
+    parseDeclItem(previousHadSemi,
+                  getMemberParseDeclOptions(idc),
+                  [&](Decl *d) { items.push_back(d); });
+  }
+
+  // Consume remaining tokens.
+  while (!Tok.is(tok::eof)) {
+    diagnose(Tok.getLoc(), diag::unexpected_member_expansion,
+             Tok.getText());
+    consumeToken();
+  }
+}
+
 /// Parse the brace-enclosed getter and setter for a variable.
 ParserResult<VarDecl>
 Parser::parseDeclVarGetSet(PatternBindingEntry &entry, ParseDeclOptions Flags,

lib/Parse/ParseRequests.cpp

@@ -174,13 +174,17 @@ SourceFileParsingResult ParseSourceFileRequest::evaluate(Evaluator &evaluator,
     switch (generatedInfo->kind) {
     case GeneratedSourceInfo::FreestandingDeclMacroExpansion:
     case GeneratedSourceInfo::ExpressionMacroExpansion:
-    case GeneratedSourceInfo::MemberMacroExpansion:
     case GeneratedSourceInfo::ReplacedFunctionBody:
     case GeneratedSourceInfo::PrettyPrinted: {
       parser.parseTopLevelItems(items);
       break;
     }
 
+    case GeneratedSourceInfo::MemberMacroExpansion: {
+      parser.parseExpandedMemberList(items);
+      break;
+    }
+
     case GeneratedSourceInfo::AccessorMacroExpansion: {
       ASTNode astNode = ASTNode::getFromOpaqueValue(generatedInfo->astNode);
       auto attachedDecl = astNode.get<Decl *>();

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -373,10 +373,22 @@ public struct AddMembers: MemberMacro {
       }
       """
 
+    let staticMethod: DeclSyntax =
+      """
+      static func method() {}
+      """
+
+    let initDecl: DeclSyntax =
+      """
+      init() {}
+      """
+
     return [
       storageStruct,
       storageVariable,
       instanceMethod,
+      staticMethod,
+      initDecl,
     ]
   }
 }

test/Macros/macro_expand_synthesized_members.swift

@@ -14,6 +14,7 @@
 @addMembers
 struct S {
   func useSynthesized() {
+    S.method()
     print(type(of: getStorage()))
   }
 }