Merge pull request #71342 from rintaro/ast-attrkind

Author: rintaro

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -394,7 +394,7 @@ class SDKNodeDecl: public SDKNode {
   bool isImplicit() const { return IsImplicit; };
   bool isStatic() const { return IsStatic; };
   bool isOverriding() const { return IsOverriding; };
-  bool isOptional() const { return hasDeclAttribute(DeclAttrKind::DAK_Optional); }
+  bool isOptional() const { return hasDeclAttribute(DeclAttrKind::Optional); }
   bool isOpen() const { return IsOpen; }
   bool isInternal() const { return IsInternal; }
   bool isABIPlaceholder() const { return IsABIPlaceholder; }
@@ -492,7 +492,7 @@ class SDKNodeTypeNominal : public SDKNodeType {
 class SDKNodeTypeFunc : public SDKNodeType {
 public:
   SDKNodeTypeFunc(SDKNodeInitInfo Info);
-  bool isEscaping() const { return hasTypeAttribute(TypeAttrKind::TAK_noescape); }
+  bool isEscaping() const { return hasTypeAttribute(TypeAttrKind::NoEscape); }
   static bool classof(const SDKNode *N);
   void diagnose(SDKNode *Right) override;
 };

include/swift/AST/ASTBridging.h

@@ -287,7 +287,7 @@ namespace swift {
   SWIFT_NAME("getter:Bridged" #CLASS "Attr.asDeclAttribute(self:)")            \
   BridgedDeclAttribute Bridged##CLASS##Attr_asDeclAttribute(                   \
       Bridged##CLASS##Attr attr);
-#include "swift/AST/Attr.def"
+#include "swift/AST/DeclAttr.def"
 
 struct BridgedPatternBindingEntry {
   BridgedPattern pattern;
@@ -423,7 +423,7 @@ BridgedDeclContext BridgedPatternBindingInitializer_asDeclContext(
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedDeclAttrKind {
 #define DECL_ATTR(_, CLASS, ...) BridgedDeclAttrKind##CLASS,
-#include "swift/AST/Attr.def"
+#include "swift/AST/DeclAttr.def"
   BridgedDeclAttrKindNone,
 };
 
@@ -1440,9 +1440,9 @@ void BridgedStmt_dump(BridgedStmt statement);
 
 // Bridged type attribute kinds, which mirror TypeAttrKind exactly.
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedTypeAttrKind {
-#define TYPE_ATTR(SPELLING, _) BridgedTypeAttrKind_##SPELLING,
-#include "swift/AST/Attr.def"
-  BridgedTypeAttrKind_None,
+#define TYPE_ATTR(_, CLASS) BridgedTypeAttrKind##CLASS,
+#include "swift/AST/TypeAttr.def"
+  BridgedTypeAttrKindNone,
 };
 
 SWIFT_NAME("BridgedTypeAttrKind.init(from:)")

include/swift/AST/ASTBridgingWrappers.def

@@ -61,10 +61,10 @@
 #include "swift/AST/PatternNodes.def"
 
 #ifndef DECL_ATTR
-#define SIMPLE_DECL_ATTR(X, CLASS, OPTIONS, CODE)
+#define SIMPLE_DECL_ATTR(...)
 #define DECL_ATTR(_, Id, ...) AST_BRIDGING_WRAPPER_NONNULL(Id##Attr)
 #endif
-#include "swift/AST/Attr.def"
+#include "swift/AST/DeclAttr.def"
 
 // Some of the base classes need to be nullable to allow them to be used as
 // optional parameters.

include/swift/AST/ASTVisitor.h

@@ -137,15 +137,11 @@ class ASTVisitor {
 
   AttributeRetTy visit(DeclAttribute *A, Args... AA) {
     switch (A->getKind()) {
-#define DECL_ATTR(_, CLASS, ...)                           \
-    case DAK_##CLASS:                                              \
-      return static_cast<ImplClass*>(this)                        \
-               ->visit##CLASS##Attr(static_cast<CLASS##Attr*>(A), \
-                                    ::std::forward<Args>(AA)...);
-#include "swift/AST/Attr.def"
-
-    case DAK_Count:
-      llvm_unreachable("Not an attribute kind");
+#define DECL_ATTR(_, CLASS, ...)                                               \
+  case DeclAttrKind::CLASS:                                                    \
+    return static_cast<ImplClass *>(this)->visit##CLASS##Attr(                 \
+        static_cast<CLASS##Attr *>(A), ::std::forward<Args>(AA)...);
+#include "swift/AST/DeclAttr.def"
     }
   }
 
@@ -154,7 +150,7 @@ class ASTVisitor {
     return static_cast<ImplClass*>(this)->visitDeclAttribute(       \
              A, ::std::forward<Args>(AA)...);                       \
   }
-#include "swift/AST/Attr.def"
+#include "swift/AST/DeclAttr.def"
 
   bool visit(ParameterList *PL) {
     return static_cast<ImplClass*>(this)->visitParameterList(PL);