More macro metaprogramming for macro roles

Author: DougGregor

lib/Parse/ParseDecl.cpp

@@ -2464,15 +2464,9 @@ getMacroIntroducedDeclNameKind(Identifier name) {
 llvm::Optional<MacroRole> getMacroRole(StringRef roleName) {
   // Match the role string to the known set of roles.
   return llvm::StringSwitch<llvm::Optional<MacroRole>>(roleName)
-      .Case("declaration", MacroRole::Declaration)
-      .Case("expression", MacroRole::Expression)
-      .Case("codeItem", MacroRole::CodeItem)
-      .Case("accessor", MacroRole::Accessor)
-      .Case("memberAttribute", MacroRole::MemberAttribute)
-      .Case("member", MacroRole::Member)
-      .Case("peer", MacroRole::Peer)
-      .Case("conformance", MacroRole::Conformance)
-      .Case("extension", MacroRole::Extension)
+#define MACRO_ROLE(Name, Description)  \
+      .Case(Description, MacroRole::Name)
+#include "swift/Basic/MacroRoles.def"
       .Default(llvm::None);
 }
 

lib/Serialization/ModuleFormat.h

@@ -645,15 +645,8 @@ enum class GenericEnvironmentKind : uint8_t {
 // These IDs must \em not be renumbered or reordered without incrementing
 // the module version.
 enum class MacroRole : uint8_t {
-  Expression,
-  Declaration,
-  Accessor,
-  MemberAttribute,
-  Member,
-  Peer,
-  Conformance,
-  CodeItem,
-  Extension,
+#define MACRO_ROLE(Name, Description) Name,
+#include "swift/Basic/MacroRoles.def"
 };
 using MacroRoleField = BCFixed<4>;
 

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -222,17 +222,17 @@ struct RawCharSourceRange {
   unsigned Length;
 };
 
-enum class MacroRole : uint32_t {
-  // This should align with 'swift::MacroRole'.
-  Expression = 0x01,
-  Declaration = 0x02,
-  Accessor = 0x04,
-  MemberAttribute = 0x08,
-  Member = 0x10,
-  Peer = 0x20,
-  Conformance = 0x40,
-  CodeItem = 0x80,
-  Extension = 0x100,
+enum class MacroRoleBits: uint8_t {
+#define MACRO_ROLE(Name, Description) Name,
+#include "swift/Basic/MacroRoles.def"
+};
+
+/// The context in which a macro can be used, which determines the syntax it
+/// uses.
+enum class MacroRole: uint32_t {
+#define MACRO_ROLE(Name, Description) \
+    Name = 1 << static_cast<uint8_t>(MacroRoleBits::Name),
+#include "swift/Basic/MacroRoles.def"
 };
 using MacroRoles = swift::OptionSet<MacroRole>;
 

tools/SourceKit/lib/SwiftLang/SwiftSyntacticMacroExpansion.cpp

@@ -43,24 +43,10 @@ void SwiftLangSupport::expandMacroSyntactically(
     unsigned offset = req.offset;
 
     swift::MacroRoles macroRoles;
-    if (req.roles.contains(SourceKit::MacroRole::Expression))
-      macroRoles |= swift::MacroRole::Expression;
-    if (req.roles.contains(SourceKit::MacroRole::Declaration))
-      macroRoles |= swift::MacroRole::Declaration;
-    if (req.roles.contains(SourceKit::MacroRole::CodeItem))
-      macroRoles |= swift::MacroRole::CodeItem;
-    if (req.roles.contains(SourceKit::MacroRole::Accessor))
-      macroRoles |= swift::MacroRole::Accessor;
-    if (req.roles.contains(SourceKit::MacroRole::MemberAttribute))
-      macroRoles |= swift::MacroRole::MemberAttribute;
-    if (req.roles.contains(SourceKit::MacroRole::Member))
-      macroRoles |= swift::MacroRole::Member;
-    if (req.roles.contains(SourceKit::MacroRole::Peer))
-      macroRoles |= swift::MacroRole::Peer;
-    if (req.roles.contains(SourceKit::MacroRole::Conformance))
-      macroRoles |= swift::MacroRole::Conformance;
-    if (req.roles.contains(SourceKit::MacroRole::Extension))
-      macroRoles |= swift::MacroRole::Extension;
+#define MACRO_ROLE(Name, Description)                   \
+    if (req.roles.contains(SourceKit::MacroRole::Name)) \
+      macroRoles |= swift::MacroRole::Name;
+#include "swift/Basic/MacroRoles.def"
 
     MacroDefinition definition = [&] {
       if (auto *expanded =

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -1963,24 +1963,10 @@ static void handleRequestSyntacticMacroExpansion(
     }
     MacroRoles macroRoles;
     for (auto uid : macroRoleUIDs) {
-      if (uid == KindMacroRoleExpression)
-        macroRoles |= MacroRole::Expression;
-      if (uid == KindMacroRoleDeclaration)
-        macroRoles |= MacroRole::Declaration;
-      if (uid == KindMacroRoleCodeItem)
-        macroRoles |= MacroRole::CodeItem;
-      if (uid == KindMacroRoleAccessor)
-        macroRoles |= MacroRole::Accessor;
-      if (uid == KindMacroRoleMemberAttribute)
-        macroRoles |= MacroRole::MemberAttribute;
-      if (uid == KindMacroRoleMember)
-        macroRoles |= MacroRole::Member;
-      if (uid == KindMacroRolePeer)
-        macroRoles |= MacroRole::Peer;
-      if (uid == KindMacroRoleConformance)
-        macroRoles |= MacroRole::Conformance;
-      if (uid == KindMacroRoleExtension)
-        macroRoles |= MacroRole::Extension;
+#define MACRO_ROLE(Name, Description)        \
+      if (uid == KindMacroRole##Name)        \
+        macroRoles |= MacroRole::Name;
+#include "swift/Basic/MacroRoles.def"
     }
 
     // definition.