Skip to content

Commit 316755e

Browse files
krzysiek84NeilFraser
authored andcommitted
Added iOS Framework target. Fixed few warnings regarding the comments
1 parent b32557a commit 316755e

File tree

3 files changed

+298
-10
lines changed

3 files changed

+298
-10
lines changed

objectivec/DiffMatchPatch.m

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ @implementation Diff
5555

5656
/**
5757
* 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.
6060
*/
6161
+ (id)diffWithOperation:(Operation)anOperation
6262
andText:(NSString *)aText;
@@ -451,7 +451,7 @@ - (NSArray *)diff_halfMatchOfFirstString:(NSString *)text1
451451
* substring is at least half the length of longtext?
452452
* @param longtext Longer NSString.
453453
* @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.
455455
* @return Five element NSArray, containing the prefix of longtext, the
456456
* suffix of longtext, the prefix of shorttext, the suffix of shorttext
457457
* and the common middle. Or nil if there was no match.
@@ -627,8 +627,8 @@ - (NSMutableArray *)diff_lineModeFromOldString:(NSString *)text1
627627
* Find the 'middle snake' of a diff, split the problem in two
628628
* and return the recursively constructed diff.
629629
* 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.
632632
* @param deadline Time at which to bail if not yet complete.
633633
* @return NSMutableArray of Diff objects.
634634
*/
@@ -863,8 +863,8 @@ - (NSArray *)diff_linesToCharsForFirstString:(NSString *)text1
863863
/**
864864
* Rehydrate the text in a diff from an NSString of line hashes to real lines
865865
* 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.
868868
*/
869869
- (void)diff_chars:(NSArray *)diffs toLines:(NSMutableArray *)lineArray;
870870
{
@@ -1976,7 +1976,7 @@ - (NSMutableArray *)patch_makeFromDiffs:(NSMutableArray *)diffs;
19761976
*/
19771977
- (NSMutableArray *)patch_makeFromOldString:(NSString *)text1
19781978
newString:(NSString *)text2
1979-
diffs:(NSMutableArray *)diffs;
1979+
diffs:(NSMutableArray *)diffs __deprecated;
19801980
{
19811981
// Check for null inputs.
19821982
if (text1 == nil || text2 == nil) {
@@ -2094,7 +2094,7 @@ - (NSMutableArray *)patch_deepCopy:(NSArray *)patches;
20942094
/**
20952095
* Merge a set of patches onto the text. Return a patched text, as well
20962096
* 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
20982098
* @param text Old text.
20992099
* @return Two element NSArray, containing the new text and an array of
21002100
* BOOL values.

0 commit comments

Comments
 (0)