[cfe-commits] r60114 - in /cfe/trunk: include/clang/AST/DeclObjC.h include/clang/Basic/DiagnosticKinds.def include/clang/Parse/Action.h lib/Parse/ParseObjc.cpp lib/Sema/Sema.h lib/Sema/SemaDeclObjC.cpp test/CodeGenObjC/continuation-class.m test/SemaObjC/property-9-impl-method.m
Fariborz Jahanian
fjahanian at apple.com
Wed Nov 26 12:01:34 PST 2008
Author: fjahanian
Date: Wed Nov 26 14:01:34 2008
New Revision: 60114
URL: http://llvm.org/viewvc/llvm-project?rev=60114&view=rev
Log:
Set default property attributes on each property.
Implemented anonymous category (also know as continuation class)
used to override main class's property attribute. This is work in
propgress.
Added:
cfe/trunk/test/CodeGenObjC/continuation-class.m
Modified:
cfe/trunk/include/clang/AST/DeclObjC.h
cfe/trunk/include/clang/Basic/DiagnosticKinds.def
cfe/trunk/include/clang/Parse/Action.h
cfe/trunk/lib/Parse/ParseObjc.cpp
cfe/trunk/lib/Sema/Sema.h
cfe/trunk/lib/Sema/SemaDeclObjC.cpp
cfe/trunk/test/SemaObjC/property-9-impl-method.m
Modified: cfe/trunk/include/clang/AST/DeclObjC.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclObjC.h?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DeclObjC.h (original)
+++ cfe/trunk/include/clang/AST/DeclObjC.h Wed Nov 26 14:01:34 2008
@@ -1228,6 +1228,11 @@
PropertyAttributes |= PRVal;
}
+ void makeitReadWriteAttribute(void) {
+ PropertyAttributes &= ~OBJC_PR_readonly;
+ PropertyAttributes |= OBJC_PR_readwrite;
+ }
+
// Helper methods for accessing attributes.
/// isReadOnly - Return true iff the property has a setter.
Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Wed Nov 26 14:01:34 2008
@@ -563,6 +563,12 @@
"property %0 '%1' attribute does not match the property inherited from %2")
DIAG(warn_property_type, WARNING,
"property type %0 does not match property type inherited from %1")
+DIAG(err_continuation_class, ERROR,
+ "continuation class has no primary class")
+DIAG(err_use_continuation_class, ERROR,
+ "use contination class to override 'readonly' property with 'readwrite'")
+DIAG(warn_property_attr_mismatch, WARNING,
+ "property attribute in continuation class does not match the primary class")
/// C++ parser diagnostics
DIAG(err_expected_unqualified_id, ERROR,
Modified: cfe/trunk/include/clang/Parse/Action.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Action.h?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Action.h (original)
+++ cfe/trunk/include/clang/Parse/Action.h Wed Nov 26 14:01:34 2008
@@ -963,6 +963,8 @@
virtual DeclTy *ActOnProperty (Scope *S, SourceLocation AtLoc,
FieldDeclarator &FD, ObjCDeclSpec &ODS,
Selector GetterSel, Selector SetterSel,
+ DeclTy *ClassCategory,
+ bool *OverridingProperty,
tok::ObjCKeywordKind MethodImplKind) {
return 0;
}
Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Wed Nov 26 14:01:34 2008
@@ -332,10 +332,14 @@
FD.D.getIdentifier());
Selector SetterSel =
PP.getSelectorTable().getUnarySelector(SetterName);
+ bool isOverridingProperty = false;
DeclTy *Property = Actions.ActOnProperty(CurScope, AtLoc, FD, OCDS,
GetterSel, SetterSel,
+ interfaceDecl,
+ &isOverridingProperty,
MethodImplKind);
- allProperties.push_back(Property);
+ if (!isOverridingProperty)
+ allProperties.push_back(Property);
}
break;
}
Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Wed Nov 26 14:01:34 2008
@@ -1051,6 +1051,7 @@
virtual DeclTy *ActOnProperty(Scope *S, SourceLocation AtLoc,
FieldDeclarator &FD, ObjCDeclSpec &ODS,
Selector GetterSel, Selector SetterSel,
+ DeclTy *ClassCategory, bool *OverridingProperty,
tok::ObjCKeywordKind MethodImplKind);
virtual DeclTy *ActOnPropertyImplDecl(SourceLocation AtLoc,
Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Wed Nov 26 14:01:34 2008
@@ -1186,12 +1186,81 @@
ObjCDeclSpec &ODS,
Selector GetterSel,
Selector SetterSel,
+ DeclTy *ClassCategory,
+ bool *isOverridingProperty,
tok::ObjCKeywordKind MethodImplKind) {
- QualType T = GetTypeForDeclarator(FD.D, S);
unsigned Attributes = ODS.getPropertyAttributes();
+ bool isReadWrite = ((Attributes & ObjCDeclSpec::DQ_PR_readwrite) ||
+ // default is readwrite!
+ !(Attributes & ObjCDeclSpec::DQ_PR_readonly));
+ // property is defaulted to 'assign' if it is readwrite and is
+ // not retain or copy
+ bool isAssign = ((Attributes & ObjCDeclSpec::DQ_PR_assign) ||
+ (isReadWrite &&
+ !(Attributes & ObjCDeclSpec::DQ_PR_retain) &&
+ !(Attributes & ObjCDeclSpec::DQ_PR_copy)));
+ QualType T = GetTypeForDeclarator(FD.D, S);
+ Decl *ClassDecl = static_cast<Decl *>(ClassCategory);
// May modify Attributes.
CheckObjCPropertyAttributes(T, AtLoc, Attributes);
+
+ if (ObjCCategoryDecl *CDecl = dyn_cast<ObjCCategoryDecl>(ClassDecl))
+ if (!CDecl->getIdentifier()) {
+ // This is an anonymous category. property requires special
+ // handling.
+ if (ObjCInterfaceDecl *ICDecl = CDecl->getClassInterface()) {
+ if (ObjCPropertyDecl *PIDecl =
+ ICDecl->FindPropertyDeclaration(FD.D.getIdentifier())) {
+ // property 'PIDecl's readonly attribute will be over-ridden
+ // with anonymous category's readwrite property attribute!
+ unsigned PIkind = PIDecl->getPropertyAttributes();
+ if (isReadWrite && (PIkind & ObjCPropertyDecl::OBJC_PR_readonly)) {
+ if ((Attributes & ObjCPropertyDecl::OBJC_PR_retain) !=
+ (PIkind & ObjCPropertyDecl::OBJC_PR_retain) ||
+ (Attributes & ObjCPropertyDecl::OBJC_PR_copy) !=
+ (PIkind & ObjCPropertyDecl::OBJC_PR_copy) ||
+ (Attributes & ObjCPropertyDecl::OBJC_PR_nonatomic) !=
+ (PIkind & ObjCPropertyDecl::OBJC_PR_nonatomic))
+ Diag(AtLoc, diag::warn_property_attr_mismatch);
+ PIDecl->makeitReadWriteAttribute();
+ if (Attributes & ObjCDeclSpec::DQ_PR_retain)
+ PIDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_retain);
+ if (Attributes & ObjCDeclSpec::DQ_PR_copy)
+ PIDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_copy);
+ PIDecl->setSetterName(SetterSel);
+ // FIXME: use a common routine with addPropertyMethods.
+ ObjCMethodDecl *SetterDecl =
+ ObjCMethodDecl::Create(Context, AtLoc, AtLoc, SetterSel,
+ Context.VoidTy,
+ ICDecl,
+ true, false, true,
+ ObjCMethodDecl::Required);
+ ParmVarDecl *Argument = ParmVarDecl::Create(Context,
+ SetterDecl,
+ SourceLocation(),
+ FD.D.getIdentifier(),
+ T,
+ VarDecl::None,
+ 0, 0);
+ SetterDecl->setMethodParams(&Argument, 1);
+ PIDecl->setSetterMethodDecl(SetterDecl);
+ }
+ else
+ Diag(AtLoc, diag::err_use_continuation_class);
+ *isOverridingProperty = true;
+ return 0;
+ }
+ // else
+ // FIXME:
+ // no matching property found in the main class. Must simply
+ // add this property to the main class's property list.
+ } else {
+ Diag(CDecl->getLocation(), diag::err_continuation_class);
+ *isOverridingProperty = true;
+ return 0;
+ }
+ }
ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, AtLoc,
FD.D.getIdentifier(), T);
@@ -1209,10 +1278,7 @@
if (Attributes & ObjCDeclSpec::DQ_PR_setter)
PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_setter);
- if (Attributes & ObjCDeclSpec::DQ_PR_assign)
- PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_assign);
-
- if (Attributes & ObjCDeclSpec::DQ_PR_readwrite)
+ if (isReadWrite)
PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_readwrite);
if (Attributes & ObjCDeclSpec::DQ_PR_retain)
@@ -1221,6 +1287,9 @@
if (Attributes & ObjCDeclSpec::DQ_PR_copy)
PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_copy);
+ if (isAssign)
+ PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_assign);
+
if (Attributes & ObjCDeclSpec::DQ_PR_nonatomic)
PDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_nonatomic);
Added: cfe/trunk/test/CodeGenObjC/continuation-class.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/continuation-class.m?rev=60114&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/continuation-class.m (added)
+++ cfe/trunk/test/CodeGenObjC/continuation-class.m Wed Nov 26 14:01:34 2008
@@ -0,0 +1,35 @@
+// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+
+ at interface Object
+- (id)new;
+ at end
+
+ at interface ReadOnly : Object
+{
+ int _object;
+ int _Anotherobject;
+}
+ at property(readonly) int object;
+ at property(readonly) int Anotherobject;
+ at end
+
+ at interface ReadOnly ()
+ at property(readwrite) int object;
+ at property(readwrite, setter = myAnotherobjectSetter:) int Anotherobject;
+ at end
+
+ at implementation ReadOnly
+ at synthesize object = _object;
+ at synthesize Anotherobject = _Anotherobject;
+- (void) myAnotherobjectSetter : (int)val {
+ _Anotherobject = val;
+}
+ at end
+
+int main(int argc, char **argv) {
+ ReadOnly *test = [ReadOnly new];
+ test.object = 12345;
+ test.Anotherobject = 200;
+ return test.object - 12345 + test.Anotherobject - 200;
+}
+
Modified: cfe/trunk/test/SemaObjC/property-9-impl-method.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-9-impl-method.m?rev=60114&r1=60113&r2=60114&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-9-impl-method.m (original)
+++ cfe/trunk/test/SemaObjC/property-9-impl-method.m Wed Nov 26 14:01:34 2008
@@ -60,4 +60,5 @@
NSRect dummy, result = {};
NSDivideRect(self.bounds, &result, &dummy, self.tabAreaThickness, self.rectEdgeForTabs);
}
+ at end
More information about the cfe-commits
mailing list