[cfe-commits] r66551 - in /cfe/trunk: include/clang/Basic/IdentifierTable.h lib/Parse/ParseObjc.cpp lib/Sema/SemaExpr.cpp lib/Sema/SemaExprObjC.cpp
Steve Naroff
snaroff at apple.com
Tue Mar 10 10:24:39 PDT 2009
Author: snaroff
Date: Tue Mar 10 12:24:38 2009
New Revision: 66551
URL: http://llvm.org/viewvc/llvm-project?rev=66551&view=rev
Log:
Simplify SelectorTable::constructSetterName() usage...
Modified:
cfe/trunk/include/clang/Basic/IdentifierTable.h
cfe/trunk/lib/Parse/ParseObjc.cpp
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/lib/Sema/SemaExprObjC.cpp
Modified: cfe/trunk/include/clang/Basic/IdentifierTable.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/IdentifierTable.h?rev=66551&r1=66550&r2=66551&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/IdentifierTable.h (original)
+++ cfe/trunk/include/clang/Basic/IdentifierTable.h Tue Mar 10 12:24:38 2009
@@ -435,13 +435,16 @@
/// constructSetterName - Return the setter name for the given
/// identifier, i.e. "set" + Name where the initial character of Name
/// has been capitalized.
- static IdentifierInfo *constructSetterName(IdentifierTable &Idents,
- const IdentifierInfo *Name) {
+ static Selector constructSetterName(IdentifierTable &Idents,
+ SelectorTable &SelTable,
+ const IdentifierInfo *Name) {
llvm::SmallString<100> SelectorName;
SelectorName = "set";
SelectorName.append(Name->getName(), Name->getName()+Name->getLength());
SelectorName[3] = toupper(SelectorName[3]);
- return &Idents.get(&SelectorName[0], &SelectorName[SelectorName.size()]);
+ IdentifierInfo *SetterName =
+ &Idents.get(&SelectorName[0], &SelectorName[SelectorName.size()]);
+ return SelTable.getUnarySelector(SetterName);
}
// Emit - Emit a SelectorTable to bitcode.
Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=66551&r1=66550&r2=66551&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Tue Mar 10 12:24:38 2009
@@ -328,11 +328,12 @@
PP.getSelectorTable().getNullarySelector(SelName);
IdentifierInfo *SetterName = OCDS.getSetterName();
if (!SetterName)
- SetterName =
- SelectorTable::constructSetterName(PP.getIdentifierTable(),
- FD.D.getIdentifier());
+ SetterName = FD.D.getIdentifier();
+
Selector SetterSel =
- PP.getSelectorTable().getUnarySelector(SetterName);
+ SelectorTable::constructSetterName(PP.getIdentifierTable(),
+ PP.getSelectorTable(),
+ SetterName);
bool isOverridingProperty = false;
DeclTy *Property = Actions.ActOnProperty(CurScope, AtLoc, FD, OCDS,
GetterSel, SetterSel,
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=66551&r1=66550&r2=66551&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Tue Mar 10 12:24:38 2009
@@ -1886,10 +1886,9 @@
// If we found a getter then this may be a valid dot-reference, we
// will look for the matching setter, in case it is needed.
- IdentifierInfo *SetterName =
- SelectorTable::constructSetterName(PP.getIdentifierTable(), &Member);
-
- Selector SetterSel = PP.getSelectorTable().getUnarySelector(SetterName);
+ Selector SetterSel =
+ SelectorTable::constructSetterName(PP.getIdentifierTable(),
+ PP.getSelectorTable(), &Member);
ObjCMethodDecl *Setter = IFace->lookupInstanceMethod(SetterSel);
if (!Setter) {
// If this reference is in an @implementation, also check for 'private'
Modified: cfe/trunk/lib/Sema/SemaExprObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprObjC.cpp?rev=66551&r1=66550&r2=66551&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprObjC.cpp Tue Mar 10 12:24:38 2009
@@ -298,10 +298,10 @@
}
// Look for the matching setter, in case it is needed.
- IdentifierInfo *SetterName =
- SelectorTable::constructSetterName(PP.getIdentifierTable(), &propertyName);
+ Selector SetterSel =
+ SelectorTable::constructSetterName(PP.getIdentifierTable(),
+ PP.getSelectorTable(), &propertyName);
- Selector SetterSel = PP.getSelectorTable().getUnarySelector(SetterName);
ObjCMethodDecl *Setter = IFace->lookupClassMethod(SetterSel);
if (!Setter) {
// If this reference is in an @implementation, also check for 'private'
More information about the cfe-commits
mailing list