diff options
Diffstat (limited to 'clang/lib/AST/JSONNodeDumper.cpp')
| -rw-r--r-- | clang/lib/AST/JSONNodeDumper.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/clang/lib/AST/JSONNodeDumper.cpp b/clang/lib/AST/JSONNodeDumper.cpp index 1f7dc5e..91281fb 100644 --- a/clang/lib/AST/JSONNodeDumper.cpp +++ b/clang/lib/AST/JSONNodeDumper.cpp @@ -999,31 +999,32 @@ void JSONNodeDumper::VisitObjCPropertyDecl(const ObjCPropertyDecl *D) { case ObjCPropertyDecl::Optional: JOS.attribute("control", "optional"); break; } - ObjCPropertyDecl::PropertyAttributeKind Attrs = D->getPropertyAttributes(); - if (Attrs != ObjCPropertyDecl::OBJC_PR_noattr) { - if (Attrs & ObjCPropertyDecl::OBJC_PR_getter) + ObjCPropertyAttribute::Kind Attrs = D->getPropertyAttributes(); + if (Attrs != ObjCPropertyAttribute::kind_noattr) { + if (Attrs & ObjCPropertyAttribute::kind_getter) JOS.attribute("getter", createBareDeclRef(D->getGetterMethodDecl())); - if (Attrs & ObjCPropertyDecl::OBJC_PR_setter) + if (Attrs & ObjCPropertyAttribute::kind_setter) JOS.attribute("setter", createBareDeclRef(D->getSetterMethodDecl())); - attributeOnlyIfTrue("readonly", Attrs & ObjCPropertyDecl::OBJC_PR_readonly); - attributeOnlyIfTrue("assign", Attrs & ObjCPropertyDecl::OBJC_PR_assign); + attributeOnlyIfTrue("readonly", + Attrs & ObjCPropertyAttribute::kind_readonly); + attributeOnlyIfTrue("assign", Attrs & ObjCPropertyAttribute::kind_assign); attributeOnlyIfTrue("readwrite", - Attrs & ObjCPropertyDecl::OBJC_PR_readwrite); - attributeOnlyIfTrue("retain", Attrs & ObjCPropertyDecl::OBJC_PR_retain); - attributeOnlyIfTrue("copy", Attrs & ObjCPropertyDecl::OBJC_PR_copy); + Attrs & ObjCPropertyAttribute::kind_readwrite); + attributeOnlyIfTrue("retain", Attrs & ObjCPropertyAttribute::kind_retain); + attributeOnlyIfTrue("copy", Attrs & ObjCPropertyAttribute::kind_copy); attributeOnlyIfTrue("nonatomic", - Attrs & ObjCPropertyDecl::OBJC_PR_nonatomic); - attributeOnlyIfTrue("atomic", Attrs & ObjCPropertyDecl::OBJC_PR_atomic); - attributeOnlyIfTrue("weak", Attrs & ObjCPropertyDecl::OBJC_PR_weak); - attributeOnlyIfTrue("strong", Attrs & ObjCPropertyDecl::OBJC_PR_strong); + Attrs & ObjCPropertyAttribute::kind_nonatomic); + attributeOnlyIfTrue("atomic", Attrs & ObjCPropertyAttribute::kind_atomic); + attributeOnlyIfTrue("weak", Attrs & ObjCPropertyAttribute::kind_weak); + attributeOnlyIfTrue("strong", Attrs & ObjCPropertyAttribute::kind_strong); attributeOnlyIfTrue("unsafe_unretained", - Attrs & ObjCPropertyDecl::OBJC_PR_unsafe_unretained); - attributeOnlyIfTrue("class", Attrs & ObjCPropertyDecl::OBJC_PR_class); - attributeOnlyIfTrue("direct", Attrs & ObjCPropertyDecl::OBJC_PR_direct); + Attrs & ObjCPropertyAttribute::kind_unsafe_unretained); + attributeOnlyIfTrue("class", Attrs & ObjCPropertyAttribute::kind_class); + attributeOnlyIfTrue("direct", Attrs & ObjCPropertyAttribute::kind_direct); attributeOnlyIfTrue("nullability", - Attrs & ObjCPropertyDecl::OBJC_PR_nullability); + Attrs & ObjCPropertyAttribute::kind_nullability); attributeOnlyIfTrue("null_resettable", - Attrs & ObjCPropertyDecl::OBJC_PR_null_resettable); + Attrs & ObjCPropertyAttribute::kind_null_resettable); } } |