@@ -55,8 +55,8 @@ @implementation Diff
55
55
56
56
/* *
57
57
* Constructor. Initializes the diff with the provided values.
58
- * @param operation One of DIFF_INSERT, DIFF_DELETE or DIFF_EQUAL.
59
- * @param text The text being applied.
58
+ * @param anOperation One of DIFF_INSERT, DIFF_DELETE or DIFF_EQUAL.
59
+ * @param aText The text being applied.
60
60
*/
61
61
+ (id )diffWithOperation : (Operation)anOperation
62
62
andText : (NSString *)aText ;
@@ -451,7 +451,7 @@ - (NSArray *)diff_halfMatchOfFirstString:(NSString *)text1
451
451
* substring is at least half the length of longtext?
452
452
* @param longtext Longer NSString.
453
453
* @param shorttext Shorter NSString.
454
- * @param i Start index of quarter length substring within longtext.
454
+ * @param index Start index of quarter length substring within longtext.
455
455
* @return Five element NSArray, containing the prefix of longtext, the
456
456
* suffix of longtext, the prefix of shorttext, the suffix of shorttext
457
457
* and the common middle. Or nil if there was no match.
@@ -627,8 +627,8 @@ - (NSMutableArray *)diff_lineModeFromOldString:(NSString *)text1
627
627
* Find the 'middle snake' of a diff, split the problem in two
628
628
* and return the recursively constructed diff.
629
629
* See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
630
- * @param text1 Old string to be diffed.
631
- * @param text2 New string to be diffed.
630
+ * @param _text1 Old string to be diffed.
631
+ * @param _text2 New string to be diffed.
632
632
* @param deadline Time at which to bail if not yet complete.
633
633
* @return NSMutableArray of Diff objects.
634
634
*/
@@ -863,8 +863,8 @@ - (NSArray *)diff_linesToCharsForFirstString:(NSString *)text1
863
863
/* *
864
864
* Rehydrate the text in a diff from an NSString of line hashes to real lines
865
865
* of text.
866
- * @param NSArray of Diff objects.
867
- * @param NSMutableArray of unique strings.
866
+ * @param diffs NSArray of Diff objects.
867
+ * @param lineArray NSMutableArray of unique strings.
868
868
*/
869
869
- (void )diff_chars : (NSArray *)diffs toLines : (NSMutableArray *)lineArray ;
870
870
{
@@ -1976,7 +1976,7 @@ - (NSMutableArray *)patch_makeFromDiffs:(NSMutableArray *)diffs;
1976
1976
*/
1977
1977
- (NSMutableArray *)patch_makeFromOldString : (NSString *)text1
1978
1978
newString : (NSString *)text2
1979
- diffs : (NSMutableArray *)diffs ;
1979
+ diffs : (NSMutableArray *)diffs __deprecated ;
1980
1980
{
1981
1981
// Check for null inputs.
1982
1982
if (text1 == nil || text2 == nil ) {
@@ -2094,7 +2094,7 @@ - (NSMutableArray *)patch_deepCopy:(NSArray *)patches;
2094
2094
/* *
2095
2095
* Merge a set of patches onto the text. Return a patched text, as well
2096
2096
* as an array of YES/NO values indicating which patches were applied.
2097
- * @param patches NSMutableArray of Patch objects
2097
+ * @param sourcePatches NSMutableArray of Patch objects
2098
2098
* @param text Old text.
2099
2099
* @return Two element NSArray, containing the new text and an array of
2100
2100
* BOOL values.
0 commit comments