diff options
| -rw-r--r-- | clang/test/Rewriter/line-generation-test.m | 12 | ||||
| -rw-r--r-- | clang/test/SemaObjC/warn-direct-ivar-access.m | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/clang/test/Rewriter/line-generation-test.m b/clang/test/Rewriter/line-generation-test.m index cafdba2..5193775 100644 --- a/clang/test/Rewriter/line-generation-test.m +++ b/clang/test/Rewriter/line-generation-test.m @@ -7,20 +7,20 @@ __attribute__((objc_root_class)) @interface MyObject { @public - id _myMaster; + id _myLeader; id _isTickledPink; } -@property(retain) id myMaster; +@property(retain) id myLeader; @property(assign) id isTickledPink; @end @implementation MyObject -@synthesize myMaster = _myMaster; +@synthesize myLeader = _myLeader; @synthesize isTickledPink = _isTickledPink; - (void) doSomething { - _myMaster = _isTickledPink; + _myLeader = _isTickledPink; } @end @@ -28,8 +28,8 @@ __attribute__((objc_root_class)) @interface MyObject { MyObject * foo () { MyObject* p; - p.isTickledPink = p.myMaster; // ok - p->_isTickledPink = p->_myMaster; + p.isTickledPink = p.myLeader; // ok + p->_isTickledPink = p->_myLeader; return p->_isTickledPink; } diff --git a/clang/test/SemaObjC/warn-direct-ivar-access.m b/clang/test/SemaObjC/warn-direct-ivar-access.m index d34e5f1..946e516 100644 --- a/clang/test/SemaObjC/warn-direct-ivar-access.m +++ b/clang/test/SemaObjC/warn-direct-ivar-access.m @@ -3,39 +3,39 @@ __attribute__((objc_root_class)) @interface MyObject { @public - id _myMaster; + id _myLeader; id _isTickledPink; // expected-error {{existing instance variable '_isTickledPink' for property 'isTickledPink'}} int _myIntProp; } -@property(retain) id myMaster; +@property(retain) id myLeader; @property(assign) id isTickledPink; // expected-note {{property declared here}} @property int myIntProp; @end @implementation MyObject -@synthesize myMaster = _myMaster; +@synthesize myLeader = _myLeader; @synthesize isTickledPink = _isTickledPink; // expected-note {{property synthesized here}} @synthesize myIntProp = _myIntProp; - (void) doSomething { - _myMaster = _isTickledPink; // expected-warning {{instance variable '_myMaster' is being directly accessed}} \ + _myLeader = _isTickledPink; // expected-warning {{instance variable '_myLeader' is being directly accessed}} \ // expected-warning {{instance variable '_isTickledPink' is being directly accessed}} } - (id) init { - _myMaster=0; - return _myMaster; + _myLeader=0; + return _myLeader; } -- (void) dealloc { _myMaster = 0; } +- (void) dealloc { _myLeader = 0; } @end MyObject * foo () { MyObject* p=0; - p.isTickledPink = p.myMaster; // ok - p->_isTickledPink = (*p)._myMaster; // expected-warning {{instance variable '_isTickledPink' is being directly accessed}} \ - // expected-warning {{instance variable '_myMaster' is being directly accessed}} + p.isTickledPink = p.myLeader; // ok + p->_isTickledPink = (*p)._myLeader; // expected-warning {{instance variable '_isTickledPink' is being directly accessed}} \ + // expected-warning {{instance variable '_myLeader' is being directly accessed}} if (p->_myIntProp) // expected-warning {{instance variable '_myIntProp' is being directly accessed}} p->_myIntProp = 0; // expected-warning {{instance variable '_myIntProp' is being directly accessed}} return p->_isTickledPink; // expected-warning {{instance variable '_isTickledPink' is being directly accessed}} |