Rename a couple of variables.

Author: Neil Fraser

objectivec/DiffMatchPatch.m

@@ -872,8 +872,8 @@ - (void)diff_chars:(NSArray *)diffs toLines:(NSMutableArray *)lineArray;
   NSUInteger lineHash;
   for (Diff *diff in diffs) {
     text = [NSMutableString string];
-    for (NSUInteger y = 0; y < [diff.text length]; y++) {
-      lineHash = (NSUInteger)[diff.text characterAtIndex:y];
+    for (NSUInteger j = 0; j < [diff.text length]; j++) {
+      lineHash = (NSUInteger)[diff.text characterAtIndex:j];
       [text appendString:[lineArray objectAtIndex:lineHash]];
     }
     diff.text = text;
@@ -1137,7 +1137,7 @@ - (void)diff_cleanupEfficiency:(NSMutableArray *)diffs;
   // Stack of indices where equalities are found.
   NSMutableArray *equalities = [NSMutableArray array];
   // Always equal to equalities.lastObject.text
-  NSString *lastequality = nil;
+  NSString *lastEquality = nil;
   NSInteger thisPointer = 0;  // Index of current position.
   // Is there an insertion operation before the last equality.
   BOOL pre_ins = NO;
@@ -1158,11 +1158,11 @@ - (void)diff_cleanupEfficiency:(NSMutableArray *)diffs;
         [equalities addObject:[NSNumber numberWithInteger:thisPointer]];
         pre_ins = post_ins;
         pre_del = post_del;
-        lastequality = thisDiff.text;
+        lastEquality = thisDiff.text;
       } else {
         // Not a candidate, and can never become one.
         [equalities removeAllObjects];
-        lastequality = nil;
+        lastEquality = nil;
       }
       post_ins = post_del = NO;
     } else {  // An insertion or deletion.
@@ -1179,13 +1179,13 @@ - (void)diff_cleanupEfficiency:(NSMutableArray *)diffs;
        * <ins>A</del>X<ins>C</ins><del>D</del>
        * <ins>A</ins><del>B</del>X<del>C</del>
        */
-      if (lastequality != nil
+      if (lastEquality != nil
           && ((pre_ins && pre_del && post_ins && post_del)
-          || ((lastequality.length < Diff_EditCost / 2)
+          || ((lastEquality.length < Diff_EditCost / 2)
           && ((pre_ins ? 1 : 0) + (pre_del ? 1 : 0) + (post_ins ? 1 : 0)
           + (post_del ? 1 : 0)) == 3))) {
         // Duplicate record.
-        [diffs insertObject:[Diff diffWithOperation:DIFF_DELETE andText:lastequality]
+        [diffs insertObject:[Diff diffWithOperation:DIFF_DELETE andText:lastEquality]
                     atIndex:equalitiesLastValue];
         // Change second copy to insert.
         // Hash values for objects must not change while in a collection
@@ -1197,7 +1197,7 @@ - (void)diff_cleanupEfficiency:(NSMutableArray *)diffs;
         [diffToChange release];
 
         [equalities removeLastObject];   // Throw away the equality we just deleted.
-        lastequality = nil;
+        lastEquality = nil;
         if (pre_ins && pre_del) {
           // No changes made which could affect previous entry, keep going.
           post_ins = post_del = YES;
@@ -1521,7 +1521,7 @@ - (void)diff_cleanupSemantic:(NSMutableArray *)diffs;
   // Stack of indices where equalities are found.
   NSMutableArray *equalities = [NSMutableArray array];
   // Always equal to equalities.lastObject.text
-  NSString *lastequality = nil;
+  NSString *lastEquality = nil;
   NSUInteger thisPointer = 0;  // Index of current position.
   // Number of characters that changed prior to the equality.
   NSUInteger length_insertions1 = 0;
@@ -1540,7 +1540,7 @@ - (void)diff_cleanupSemantic:(NSMutableArray *)diffs;
       length_deletions1 = length_deletions2;
       length_insertions2 = 0;
       length_deletions2 = 0;
-      lastequality = thisDiff.text;
+      lastEquality = thisDiff.text;
     } else {  // an insertion or deletion
       if (thisDiff.operation == DIFF_INSERT) {
         length_insertions2 += thisDiff.text.length;
@@ -1549,11 +1549,11 @@ - (void)diff_cleanupSemantic:(NSMutableArray *)diffs;
       }
       // Eliminate an equality that is smaller or equal to the edits on both
       // sides of it.
-      if (lastequality != nil
-          && (lastequality.length <= MAX(length_insertions1, length_deletions1))
-          && (lastequality.length <= MAX(length_insertions2, length_deletions2))) {
+      if (lastEquality != nil
+          && (lastEquality.length <= MAX(length_insertions1, length_deletions1))
+          && (lastEquality.length <= MAX(length_insertions2, length_deletions2))) {
         // Duplicate record.
-        [diffs insertObject:[Diff diffWithOperation:DIFF_DELETE andText:lastequality] atIndex:equalitiesLastValue];
+        [diffs insertObject:[Diff diffWithOperation:DIFF_DELETE andText:lastEquality] atIndex:equalitiesLastValue];
         // Change second copy to insert.
         // Hash values for objects must not change while in a collection.
         indexToChange = equalitiesLastValue + 1;
@@ -1576,7 +1576,7 @@ - (void)diff_cleanupSemantic:(NSMutableArray *)diffs;
         length_deletions1 = 0;
         length_insertions2 = 0;
         length_deletions2 = 0;
-        lastequality = nil;
+        lastEquality = nil;
         changes = YES;
       }
     }