-
Notifications
You must be signed in to change notification settings - Fork 6
/
UKDiffParser.m
655 lines (551 loc) · 17.2 KB
/
UKDiffParser.m
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
//
// UKDiffParser.m
// AngelDiff
//
// Created by Uli Kusterer on 02.08.08.
// Copyright 2008 The Void Software. All rights reserved.
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
#import "UKDiffParser.h"
#import "UKHelperMacros.h"
@implementation UKDiffParser
@synthesize differences;
-(id) initWithDiffText: (NSString*)diffText
{
if(( self = [super init] ))
{
self.differences = [NSMutableArray array];
NSUInteger currPos = 0, endPos = [diffText length];
while( currPos < endPos )
{
unichar currCh = [diffText characterAtIndex: currPos];
if( currCh == '\n' || currCh == '\r' ) // Empty line? Skip.
{
currPos++;
continue;
}
// Get info about operation:
NSUInteger num[4] = { 0, 0, 0, 0 },
numIdx = 0;
unichar separators[4] = { 0, 0, 0, 0 };
NSMutableString* currStr = [NSMutableString string];
while( currPos < endPos )
{
currCh = [diffText characterAtIndex: currPos++];
if( isnumber( currCh ) )
[currStr appendFormat: @"%C", currCh];
else
{
num[numIdx] = [currStr integerValue];
separators[numIdx] = currCh;
numIdx++;
[currStr deleteCharactersInRange: NSMakeRange( 0, [currStr length] )];
if( currCh == '\n' || currCh == '\r' )
break;
}
}
NSRange originalRange, destRange;
originalRange.location = num[0] -1;
NSUInteger separatorIdx = 0;
if( separators[0] == ',' )
{
originalRange.length = num[1] -originalRange.location;
separatorIdx++;
}
else
originalRange.length = 1;
destRange.location = num[separatorIdx+1] -1;
if( separators[separatorIdx+1] == ',' )
destRange.length = num[separatorIdx+2] -destRange.location;
else
destRange.length = 1;
// If it's a source line, ignore it for now:
currCh = [diffText characterAtIndex: currPos];
while( currCh == '<' && currPos < endPos )
{
do
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
}
while( currCh != '\n' && currCh != '\r' && currPos < endPos );
if( currPos < (endPos-1) )
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
}
}
if( currCh == '-' && currPos < endPos ) // Skip separator line.
{
do
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
}
while( currCh != '\n' && currCh != '\r' && currPos < endPos );
if( currPos < (endPos-1) )
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
}
}
NSMutableString* newString = [NSMutableString string];
while( currCh == '>' && currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
if( currCh != ' ' ) // There's a greater-than and a space, usually.
currPos--;
do
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
[newString appendFormat: @"%C", currCh];
}
while( currCh != '\n' && currCh != '\r' && currPos < endPos );
if( currPos < (endPos-1) )
{
currPos++;
currCh = [diffText characterAtIndex: currPos];
}
}
UKDiffEntry* currDiff = [[[UKDiffEntry alloc] init] autorelease];
[currDiff setOperation: separators[separatorIdx]];
[currDiff setOriginalRange: originalRange];
[currDiff setDestinationRange: destRange];
[currDiff setNewText: newString];
[differences addObject: currDiff];
}
}
return self;
}
-(id) initWithUnifiedDiffText: (NSString*)diffText
{
if(( self = [super init] ))
{
self.differences = [NSMutableArray array];
NSUInteger currPos = 0, endPos = [diffText length];
while( currPos < endPos )
{
UKLog(@"NEW ITERATION");
unichar currCh = [diffText characterAtIndex: currPos];
if( currCh == '-' || currCh == '+' )
{
while( (currCh != '\n' && currCh != '\r') && currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
}
UKLog(@"\tSkipping file marker line");
}
if( currCh == '\n' || currCh == '\r' ) // Empty line? Skip.
{
UKLog(@"\tSkipping empty line");
++currPos;
continue;
}
// @@
if( currCh != '@' )
{
[self autorelease];
UKLog(@"NO @@ Marker found");
return nil;
}
currCh = [diffText characterAtIndex: ++currPos];
if( currCh != '@' )
{
[self autorelease];
UKLog(@"NO @@ Marker found");
return nil;
}
UKLog(@"\t@@ Markers found");
currCh = [diffText characterAtIndex: ++currPos];
while( currCh == ' ' || currCh == '\t' )
currCh = [diffText characterAtIndex: ++currPos];
// -nnn,nn
if( currCh != '-' )
{
[self autorelease];
UKLog(@"NO - found");
return nil;
}
NSRange leftRange;
NSMutableString* numStr = [NSMutableString string];
while( currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
if( !isnumber( currCh ) )
break;
[numStr appendFormat: @"%C", currCh];
}
leftRange.location = [numStr integerValue] -1;
UKLog(@"\tleftRange.location = %ld",leftRange.location);
if( currCh != ',' )
{
leftRange.length = 1;
currPos++;
}
else
{
[numStr deleteCharactersInRange: NSMakeRange( 0, [numStr length] )];
while( currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
if( !isnumber( currCh ) )
break;
[numStr appendFormat: @"%C", currCh];
}
leftRange.length = [numStr integerValue];
}
UKLog(@"\tleftRange.length = %ld",leftRange.length);
while( currCh == ' ' || currCh == '\t' )
currCh = [diffText characterAtIndex: ++currPos];
// +nnn,nn
if( currCh != '+' )
{
[self autorelease];
UKLog(@"\tNO + found");
return nil;
}
NSRange rightRange;
numStr = [NSMutableString string];
while( currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
if( !isnumber( currCh ) )
break;
[numStr appendFormat: @"%C", currCh];
}
rightRange.location = [numStr integerValue] -1;
UKLog(@"\trightRange.location = %ld",rightRange.location);
if( currCh != ',' )
{
rightRange.length = 1;
currPos++;
}
else
{
[numStr deleteCharactersInRange: NSMakeRange( 0, [numStr length] )];
while( currPos < endPos )
{
currCh = [diffText characterAtIndex: ++currPos];
if( !isnumber( currCh ) )
break;
[numStr appendFormat: @"%C", currCh];
}
rightRange.length = [numStr integerValue];
}
UKLog(@"\trightRange.length = %ld",rightRange.length);
while( currCh == ' ' || currCh == '\t' )
currCh = [diffText characterAtIndex: ++currPos];
if( currCh != '@' )
{
[self autorelease];
UKLog(@"NO ending @@");
return nil;
}
currCh = [diffText characterAtIndex: ++currPos];
if( currCh != '@' )
{
[self autorelease];
UKLog(@"NO ending @@");
return nil;
}
currCh = [diffText characterAtIndex: ++currPos];
while( (currCh == '\n' || currCh == '\r') && currPos < (endPos-1) )
currCh = [diffText characterAtIndex: ++currPos];
if( leftRange.location == 355 )
NSLog(@"355");
while( (currCh == ' ' || currCh == '-' || currCh == '+') && currPos < (endPos-1) )
{
leftRange.length = rightRange.length = 0;
// Now skip those useless context lines:
while( currCh == ' ' )
{
leftRange.location ++;
rightRange.location ++;
while( (currCh != '\n' && currCh != '\r') && currPos < (endPos-1) )
currCh = [diffText characterAtIndex: ++currPos];
while( (currCh == '\n' || currCh == '\r') && currPos < (endPos-1) )
currCh = [diffText characterAtIndex: ++currPos];
UKLog(@"Skipping context line");
}
// Obtain original lines:
NSMutableString* leftString = [NSMutableString string];
while( currCh == '-' )
{
currCh = [diffText characterAtIndex: ++currPos];
while( (currCh != '\n' && currCh != '\r') && currPos < (endPos-1) )
{
[leftString appendFormat: @"%C",currCh];
currCh = [diffText characterAtIndex: ++currPos];
}
while( (currCh == '\n' || currCh == '\r') && currPos < (endPos-1) )
{
leftRange.length++;
[leftString appendFormat: @"%C",currCh];
currCh = [diffText characterAtIndex: ++currPos];
}
UKLog(@"Found - line");
}
// Obtain new lines:
NSMutableString* rightString = [NSMutableString string];
while( currCh == '+' )
{
currCh = [diffText characterAtIndex: ++currPos];
while( (currCh != '\n' && currCh != '\r') && currPos < (endPos-1) )
{
[rightString appendFormat: @"%C",currCh];
currCh = [diffText characterAtIndex: ++currPos];
}
while( (currCh == '\n' || currCh == '\r') && currPos < (endPos-1) )
{
rightRange.length++;
[rightString appendFormat: @"%C",currCh];
currCh = [diffText characterAtIndex: ++currPos];
}
UKLog(@"Found + line");
}
UKDiffEntry* currDiff = [[[UKDiffEntry alloc] init] autorelease];
UKDiffOperation op = UKDiffOperationChange;
if( [leftString length] == 0 )
op = UKDiffOperationAdd;
else if( [rightString length] == 0 )
op = UKDiffOperationDelete;
[currDiff setOperation: op];
[currDiff setOriginalRange: leftRange];
[currDiff setDestinationRange: rightRange];
[currDiff setNewText: rightString];
[currDiff setOldText: leftString];
[differences addObject: currDiff];
UKLog( @"%@", currDiff );
leftRange.location += leftRange.length;
rightRange.location += rightRange.length;
// Skip remaining context lines:
while( currCh == ' ' || currCh == '\\' )
{
leftRange.location ++;
rightRange.location ++;
while( (currCh != '\n' && currCh != '\r') && currPos < (endPos-1) )
currCh = [diffText characterAtIndex: ++currPos];
while( (currCh == '\n' || currCh == '\r') && currPos < (endPos-1) )
currCh = [diffText characterAtIndex: ++currPos];
UKLog(@"Skipped trailing context line");
}
}
}
}
UKLog(@"parsed");
return self;
}
-(void) dealloc
{
DESTROY(differences);
[super dealloc];
}
-(NSArray*) linesArrayForText: (NSString*)str
{
NSMutableArray* lines = [NSMutableArray array];
NSMutableString* currStr = [NSMutableString string];
NSUInteger x = 0, len = [str length];
for( x = 0; x < len; x++ )
{
unichar currCh = [str characterAtIndex: x];
[currStr appendFormat: @"%C",currCh];
if( currCh == '\n' || currCh == '\r' )
{
[lines addObject: currStr];
currStr = [NSMutableString string];
}
}
if( [currStr length] > 0 )
[lines addObject: currStr];
return lines;
}
-(NSString*) stringByApplyingChangesToOriginalText: (NSString*)origText
{
NSArray* originalLines = [self linesArrayForText: origText];
NSUInteger currOriginalLine = 0, maxOriginalLines = [originalLines count];
NSMutableString* outStr = [NSMutableString string];
for( UKDiffEntry* currDiff in differences )
{
UKDiffOperation operation = [currDiff operation];
NSRange originalRange = [currDiff originalRange];
NSString* newString = [currDiff newText];
if( operation == UKDiffOperationUnchanged ) // Ignore those, we do that ourselves.
continue;
while( originalRange.location > currOriginalLine )
{
NSString* theLine = [originalLines objectAtIndex: currOriginalLine++];
[outStr appendString: theLine];
}
if( operation == UKDiffOperationChange )
{
[outStr appendString: newString];
currOriginalLine += originalRange.length;
}
else if( operation == UKDiffOperationDelete )
{
currOriginalLine += originalRange.length;
}
else if( operation == UKDiffOperationAdd )
{
while( (originalRange.location +originalRange.length) > currOriginalLine )
{
NSString* theLine = [originalLines objectAtIndex: currOriginalLine++];
[outStr appendString: theLine];
}
[outStr appendString: newString];
}
}
while( maxOriginalLines > currOriginalLine )
[outStr appendString: [originalLines objectAtIndex: currOriginalLine++]];
return outStr;
}
-(void) applyOriginalText: (NSString*)origText
{
NSArray* originalLines = [self linesArrayForText: origText];
NSUInteger currOriginalLine = 0, maxOriginalLines = [originalLines count];
NSUInteger prevOriginalLine = 0;
NSMutableArray* newDifferences = [NSMutableArray array];
if( [originalLines count] == 0 )
return;
for( UKDiffEntry* currDiff in differences )
{
NSRange originalRange = [currDiff originalRange];
UKDiffOperation operation = [currDiff operation];
if( operation == UKDiffOperationUnchanged ) // Drop any leftover unchanged entries from a previous run.
continue;
// Generate an entry for any unchanged text between this difference and the previous one:
NSUInteger lastLineNeeded = originalRange.location;
if( operation == UKDiffOperationAdd )
lastLineNeeded += originalRange.length;
prevOriginalLine = currOriginalLine;
NSMutableString* currStr = [NSMutableString string];
while( lastLineNeeded > currOriginalLine )
{
NSString* theLine = [originalLines objectAtIndex: currOriginalLine++];
[currStr appendString: theLine];
}
if( [currStr length] > 0 )
{
UKDiffEntry* newDiff = [[[UKDiffEntry alloc] init] autorelease];
[newDiff setOperation: UKDiffOperationUnchanged];
[newDiff setOriginalRange: NSMakeRange(prevOriginalLine,currOriginalLine -prevOriginalLine)];
[newDiff setOldText: currStr];
[newDiff setNewText: currStr];
[newDifferences addObject: newDiff];
}
// Now create an entry for the current change:
if( operation == UKDiffOperationAdd )
[newDifferences addObject: currDiff]; // Add object is already done, doesn't need an 'oldText'.
else // Change or delete:
{
// Capture old text and add it to this diff item:
NSMutableString* replicatedString = [NSMutableString string];
while( (originalRange.location +originalRange.length) > currOriginalLine )
{
NSString* theLine = [originalLines objectAtIndex: currOriginalLine++];
[replicatedString appendString: theLine];
}
[currDiff setOldText: replicatedString];
[newDifferences addObject: currDiff];
}
}
// Append any remaining unchanged text at end of diffs:
NSMutableString* finalStr = [NSMutableString string];
prevOriginalLine = currOriginalLine;
while( maxOriginalLines > currOriginalLine )
[finalStr appendString: [originalLines objectAtIndex: currOriginalLine++]];
if( [finalStr length] > 0 )
{
UKDiffEntry* newDiff = [[[UKDiffEntry alloc] init] autorelease];
[newDiff setOperation: UKDiffOperationUnchanged];
[newDiff setOriginalRange: NSMakeRange(prevOriginalLine,currOriginalLine -prevOriginalLine)];
[newDiff setOldText: finalStr];
[newDiff setNewText: finalStr];
[newDifferences addObject: newDiff];
}
// Replace old differences array with new one containing both texts:
self.differences = newDifferences;
}
-(NSString*) originalString // Must have called applyOriginalText: once before using this.
{
NSMutableString* outStr = [NSMutableString string];
for( UKDiffEntry* currDiff in differences )
{
NSString* currStr = [currDiff oldText];
if( currStr )
[outStr appendString: currStr];
}
return outStr;
}
-(NSString*) destinationString // Must have called applyOriginalText: once before using this.
{
NSMutableString* outStr = [NSMutableString string];
for( UKDiffEntry* currDiff in differences )
{
NSString* currStr = [currDiff newText];
if( currStr )
[outStr appendString: currStr];
}
return outStr;
}
-(NSString*) mergedString // Must have called applyOriginalText: once before using this.
{
NSMutableString* outStr = [NSMutableString string];
for( UKDiffEntry* currDiff in differences )
{
NSString* currStr = [currDiff apply] ? [currDiff newText] : [currDiff oldText];
if( currStr )
[outStr appendString: currStr];
}
return outStr;
}
-(NSUInteger) count
{
return [differences count];
}
-(UKDiffEntry*) entryAtIndex: (NSUInteger)idx
{
return [differences objectAtIndex: idx];
}
@end
@implementation UKDiffEntry
@synthesize operation;
@synthesize originalRange;
@synthesize destinationRange;
@synthesize newText;
@synthesize oldText;
@synthesize apply;
-(id) init
{
if(( self = [super init] ))
{
apply = YES;
}
return self;
}
-(NSString*) description
{
return [NSString stringWithFormat: @"%@ { operation = %c originalRange = { %ld, %ld }, destinationRange = { %ld, %ld }, apply = %s }",
NSStringFromClass([self class]), operation, originalRange.location, originalRange.length,
destinationRange.location, destinationRange.length, (apply? "YES":"NO")];
}
@end