Refactor and fix gcc errors

Author: Hendrik Hübner

Source/NSKVOSupport.m

@@ -207,6 +207,8 @@ - (void) dealloc
   [super dealloc];
 }
 
+// While exploring the observer graph, for dependencies, we use this to 
+// detect cycles to prevent infinite recursion. 
 - (void) beginDependencyExpansionScope
 {
   GS_MUTEX_LOCK(_lock);
@@ -219,6 +221,8 @@ - (void) beginDependencyExpansionScope
   GS_MUTEX_UNLOCK(_lock);
 }
 
+/* Nodes (observable values) in the observer graph are uniquely identified
+ * using a combination of the object pointer and the name of the value */
 - (id) dependencyKeyForObject: (id)object key: (NSString *)key
 {
   return [NSArray arrayWithObjects:
@@ -227,7 +231,7 @@ - (id) dependencyKeyForObject: (id)object key: (NSString *)key
                    nil];
 }
 
-- (void) pushAncestorForNode: (_NSKVOKeyObserver *)keyObserver
+- (void) pushObserverToCurrentAncestorStack: (_NSKVOKeyObserver *)keyObserver
 {
   id ancestorKey = [self dependencyKeyForObject: keyObserver.object
                                             key: keyObserver.key];
@@ -236,7 +240,7 @@ - (void) pushAncestorForNode: (_NSKVOKeyObserver *)keyObserver
   GS_MUTEX_UNLOCK(_lock);
 }
 
-- (void) popAncestorForNode: (_NSKVOKeyObserver *)keyObserver
+- (void) popObserverFromCurrentAncestorStack: (_NSKVOKeyObserver *)keyObserver
 {
   id ancestorKey = [self dependencyKeyForObject: keyObserver.object
                                             key: keyObserver.key];
@@ -246,7 +250,7 @@ - (void) popAncestorForNode: (_NSKVOKeyObserver *)keyObserver
 }
 
 /// Mark keypath as visited in the current dependency-expansion scope.
-- (BOOL) markDependentKeypathVisited: (NSString *)keypath
+- (BOOL) checkDependencyForCycle: (NSString *)keypath
                              forNode: (_NSKVOKeyObserver *)keyObserver
 {
   NSString *dependentKey;
@@ -261,7 +265,7 @@ - (BOOL) markDependentKeypathVisited: (NSString *)keypath
     {
       BOOL isCycle = [_dependencyAncestorKeys containsObject: visitToken];
       GS_MUTEX_UNLOCK(_lock);
-      // If it's on the active ancestor stack, treat as true cycle and dedup.
+      // If it's on the current ancestor stack, treat as cycle and dedup.
       // If it's already visited but not on stack, allow expansion to continue.
       return !isCycle;
     }
@@ -407,16 +411,17 @@ - (bool) isEmpty
           }
 
           [observationInfo beginDependencyExpansionScope];
-          [observationInfo pushAncestorForNode: keyObserver];
+          [observationInfo pushObserverToCurrentAncestorStack: keyObserver];
           /* Don't allow our own key to be recreated. */
-          [observationInfo markDependentKeypathVisited:keyObserver.key
+          [observationInfo checkDependencyForCycle:keyObserver.key
                                                forNode:keyObserver];
 
+          /* The observers, which affect us */
           dependentObservers =
             [NSMutableArray arrayWithCapacity:[valueInfluencingKeys count]];
           for (NSString *dependentKeypath in valueInfluencingKeys)
             {
-              if ([observationInfo markDependentKeypathVisited:dependentKeypath
+              if ([observationInfo checkDependencyForCycle:dependentKeypath
                                                        forNode:keyObserver])
                 {
                   _NSKVOKeyObserver *dependentObserver
@@ -428,13 +433,10 @@ - (bool) isEmpty
                       [dependentObservers addObject:dependentObserver];
                     }
                 }
-              else
-                {
-                }
             }
           keyObserver.dependentObservers = dependentObservers;
 
-          [observationInfo popAncestorForNode: keyObserver];
+          [observationInfo popObserverFromCurrentAncestorStack: keyObserver];
           [observationInfo endDependencyExpansionScope];
         }
     }

Tests/base/NSKVOSupport/ComplexNilAndCycleTest.m

@@ -6,12 +6,16 @@
 @interface CNode : NSObject
 {
   NSInteger _f;
+  NSObject *_d;
+  BNode *_b;
 }
 @property (nonatomic, retain) NSObject *d;
 @property (nonatomic, retain) BNode *b;
 @property (nonatomic, assign) NSInteger f;
 @end
 @implementation CNode
+@synthesize d = _d;
+@synthesize b = _b;
 - (NSInteger) f
 {
   return _f;
@@ -34,24 +38,40 @@ - (void) setF: (NSInteger)f
 @end
 
 @interface BNode : NSObject
+{
+  CNode *_c;
+  NSInteger _e;
+}
 @property (nonatomic, retain) CNode *c;
 @property (nonatomic, assign) NSInteger e;
 @end
 @implementation BNode
+@synthesize c = _c;
+@synthesize e = _e;
 @end
 
 @interface ANode : NSObject
+{
+  BNode *_b;
+  CNode *_c;
+}
 @property (nonatomic, retain) BNode *b;
 @property (nonatomic, retain) CNode *c;
 @end
 @implementation ANode
+@synthesize b = _b;
+@synthesize c = _c;
 @end
 
 @interface RootNode : NSObject
+{
+  ANode *_a;
+}
 @property (nonatomic, retain) ANode *a;
 @property (nonatomic, readonly) BOOL x;
 @end
 @implementation RootNode
+@synthesize a = _a;
 + (NSSet *) keyPathsForValuesAffectingX
 {
   return [NSSet setWithObjects: @"a.b.c.d", @"a.c.b.e", nil];

Tests/base/NSKVOSupport/branchVisitedScope.m

@@ -2,19 +2,29 @@
 #import "ObjectTesting.h"
 
 @interface BVSLeaf : NSObject
+{
+  NSInteger _value;
+  BOOL _flag;
+}
 @property (nonatomic, assign) NSInteger value;
 @property (nonatomic, assign) BOOL flag;
 @end
 
 @implementation BVSLeaf
+@synthesize value = _value;
+@synthesize flag = _flag;
 @end
 
 @interface BVSNode : NSObject
+{
+  BVSLeaf *_leaf;
+}
 @property (nonatomic, retain) BVSLeaf *leaf;
 @property (nonatomic, readonly) NSInteger score;
 @end
 
 @implementation BVSNode
+@synthesize leaf = _leaf;
 + (NSSet *) keyPathsForValuesAffectingScore
 {
   return [NSSet setWithObject: @"leaf.value"];
@@ -26,18 +36,26 @@ - (NSInteger) score
 @end
 
 @interface BVSHolder : NSObject
+{
+  BVSNode *_node;
+}
 @property (nonatomic, retain) BVSNode *node;
 @end
 @implementation BVSHolder
+@synthesize node = _node;
 @end
 
 @interface BVSRoot : NSObject
+{
+  BVSHolder *_holder;
+}
 @property (nonatomic, retain) BVSHolder *holder;
 @property (nonatomic, readonly) BVSNode *selected;
 @property (nonatomic, readonly) BOOL derived;
 @end
 
 @implementation BVSRoot
+@synthesize holder = _holder;
 + (NSSet *) keyPathsForValuesAffectingSelected
 {
   return [NSSet setWithObject: @"holder.node"];
@@ -97,7 +115,8 @@ int main(void)
             context: NULL];
 
   // Repeatedly rematerialize the shared dependency path.
-  for (NSUInteger i = 0; i < 25; i++)
+  NSUInteger i;
+  for (i = 0; i < 25; i++)
     {
       root.holder.node = nil;
       root.holder.node = node;

Tests/base/NSKVOSupport/cyclicalDependencies.m

@@ -23,13 +23,17 @@ - (void) observeValueForKeyPath: (NSString *)keyPath
 @end
 
 @interface CDODirectCycleRoot : NSObject
+{
+  NSInteger _leaf;
+}
 @property (nonatomic, assign) NSInteger leaf;
 @property (nonatomic, readonly) NSInteger a;
 @property (nonatomic, readonly) NSInteger b;
 @property (nonatomic, readonly) NSInteger derived;
 @end
 
 @implementation CDODirectCycleRoot
+@synthesize leaf = _leaf;
 + (NSSet *) keyPathsForValuesAffectingA
 {
   return [NSSet setWithObject: @"b"];
@@ -57,6 +61,9 @@ - (NSInteger) derived
 @end
 
 @interface CDOThreeCycleRoot : NSObject
+{
+  NSInteger _leaf;
+}
 @property (nonatomic, assign) NSInteger leaf;
 @property (nonatomic, readonly) NSInteger x;
 @property (nonatomic, readonly) NSInteger y;
@@ -65,6 +72,7 @@ @interface CDOThreeCycleRoot : NSObject
 @end
 
 @implementation CDOThreeCycleRoot
+@synthesize leaf = _leaf;
 + (NSSet *) keyPathsForValuesAffectingX
 {
   return [NSSet setWithObject: @"y"];

Tests/base/NSKVOSupport/visitedAliasCollision.m

@@ -2,17 +2,27 @@
 #import "ObjectTesting.h"
 
 @interface VACLeaf : NSObject
+{
+  NSInteger _value;
+  BOOL _flag;
+}
 @property (nonatomic, assign) NSInteger value;
 @property (nonatomic, assign) BOOL flag;
 @end
 @implementation VACLeaf
+@synthesize value = _value;
+@synthesize flag = _flag;
 @end
 
 @interface VACNode : NSObject
+{
+  VACLeaf *_leaf;
+}
 @property (nonatomic, retain) VACLeaf *leaf;
 @property (nonatomic, readonly) NSInteger score;
 @end
 @implementation VACNode
+@synthesize leaf = _leaf;
 + (NSSet *) keyPathsForValuesAffectingScore
 {
   return [NSSet setWithObject: @"leaf.value"];
@@ -24,19 +34,27 @@ - (NSInteger) score
 @end
 
 @interface VACHolder : NSObject
+{
+  VACNode *_node;
+}
 @property (nonatomic, retain) VACNode *node;
 @end
 @implementation VACHolder
+@synthesize node = _node;
 @end
 
 @interface VACRoot : NSObject
+{
+  VACHolder *_holder;
+}
 @property (nonatomic, retain) VACHolder *holder;
 @property (nonatomic, readonly) VACNode *selectedA;
 @property (nonatomic, readonly) VACNode *selectedB;
 @property (nonatomic, readonly) BOOL derived;
 @end
 
 @implementation VACRoot
+@synthesize holder = _holder;
 + (NSSet *) keyPathsForValuesAffectingSelectedA
 {
   return [NSSet setWithObject: @"holder.node"];