[cfe-commits] r42490 - in /cfe/trunk: AST/Decl.cpp Sema/SemaDecl.cpp
Fariborz Jahanian
fjahanian at apple.com
Mon Oct 1 09:53:59 PDT 2007
Author: fjahanian
Date: Mon Oct 1 11:53:59 2007
New Revision: 42490
URL: http://llvm.org/viewvc/llvm-project?rev=42490&view=rev
Log:
Took care of clatter's suggestions, dated.
September 30, 2007 12:36:58 AM PDT and
September 30, 2007 12:50:05 AM PDT
Modified:
cfe/trunk/AST/Decl.cpp
cfe/trunk/Sema/SemaDecl.cpp
Modified: cfe/trunk/AST/Decl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/Decl.cpp?rev=42490&r1=42489&r2=42490&view=diff
==============================================================================
--- cfe/trunk/AST/Decl.cpp (original)
+++ cfe/trunk/AST/Decl.cpp Mon Oct 1 11:53:59 2007
@@ -264,7 +264,7 @@
}
void ObjcMethodDecl::setMethodParams(ParmVarDecl **NewParamInfo,
- unsigned NumParams) {
+ unsigned NumParams) {
assert(ParamInfo == 0 && "Already has param info!");
// Zero params -> null pointer.
Modified: cfe/trunk/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaDecl.cpp?rev=42490&r1=42489&r2=42490&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/Sema/SemaDecl.cpp Mon Oct 1 11:53:59 2007
@@ -1439,25 +1439,16 @@
return NewFD;
}
-static void ObjcSetIvarVisibility(ObjcIvarDecl *OIvar,
- tok::ObjCKeywordKind ivarVisibility) {
- assert(OIvar && "missing instance variable");
+/// TranslateIvarVisibility - Translate visibility from a token ID to an
+/// AST enum value.
+static ObjcIvarDecl::AccessControl
+TranslateIvarVisibility(tok::ObjCKeywordKind ivarVisibility) {
switch (ivarVisibility) {
- case tok::objc_private:
- OIvar->setAccessControl(ObjcIvarDecl::Private);
- break;
- case tok::objc_public:
- OIvar->setAccessControl(ObjcIvarDecl::Public);
- break;
- case tok::objc_protected:
- OIvar->setAccessControl(ObjcIvarDecl::Protected);
- break;
- case tok::objc_package:
- OIvar->setAccessControl(ObjcIvarDecl::Package);
- break;
- default:
- OIvar->setAccessControl(ObjcIvarDecl::None);
- break;
+ case tok::objc_private: return ObjcIvarDecl::Private;
+ case tok::objc_public: return ObjcIvarDecl::Public;
+ case tok::objc_protected: return ObjcIvarDecl::Protected;
+ case tok::objc_package: return ObjcIvarDecl::Package;
+ default: assert(false && "Unknown visitibility kind");
}
}
@@ -1498,7 +1489,8 @@
// If we have visibility info, make sure the AST is set accordingly.
if (visibility)
- ObjcSetIvarVisibility(dyn_cast<ObjcIvarDecl>(FD), visibility[i]);
+ cast<ObjcIvarDecl>(FD)->setAccessControl(
+ TranslateIvarVisibility(visibility[i]));
// C99 6.7.2.1p2 - A field may not be a function type.
if (FDTy->isFunctionType()) {
More information about the cfe-commits
mailing list