Skip to content

Commit 6ea48d6

Browse files
author
Neil Fraser
committed
Rename variable.
Resolves error when compiling JS strictly.
1 parent f35f1a5 commit 6ea48d6

File tree

7 files changed

+36
-35
lines changed

7 files changed

+36
-35
lines changed

csharp/DiffMatchPatch.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ private List<Diff> diff_compute(string text1, string text2,
382382
private List<Diff> diff_lineMode(string text1, string text2,
383383
DateTime deadline) {
384384
// Scan the text on a line-by-line basis first.
385-
Object[] b = diff_linesToChars(text1, text2);
386-
text1 = (string)b[0];
387-
text2 = (string)b[1];
388-
List<string> linearray = (List<string>)b[2];
385+
Object[] a = diff_linesToChars(text1, text2);
386+
text1 = (string)a[0];
387+
text2 = (string)a[1];
388+
List<string> linearray = (List<string>)a[2];
389389

390390
List<Diff> diffs = diff_main(text1, text2, false, deadline);
391391

@@ -419,10 +419,10 @@ private List<Diff> diff_lineMode(string text1, string text2,
419419
diffs.RemoveRange(pointer - count_delete - count_insert,
420420
count_delete + count_insert);
421421
pointer = pointer - count_delete - count_insert;
422-
List<Diff> a =
422+
List<Diff> subDiff =
423423
this.diff_main(text_delete, text_insert, false, deadline);
424-
diffs.InsertRange(pointer, a);
425-
pointer = pointer + a.Count;
424+
diffs.InsertRange(pointer, subDiff);
425+
pointer = pointer + subDiff.Count;
426426
}
427427
count_insert = 0;
428428
count_delete = 0;

dart/DMPClass.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,12 @@ class DiffMatchPatch {
267267
// Delete the offending records and add the merged ones.
268268
diffs.removeRange(pointer - count_delete - count_insert, pointer);
269269
pointer = pointer - count_delete - count_insert;
270-
final a = diff_main(text_delete.toString(), text_insert.toString(),
271-
false, deadline);
272-
for (int j = a.length - 1; j >= 0; j--) {
273-
diffs.insert(pointer, a[j]);
270+
final subDiff = diff_main(text_delete.toString(),
271+
text_insert.toString(), false, deadline);
272+
for (int j = subDiff.length - 1; j >= 0; j--) {
273+
diffs.insert(pointer, subDiff[j]);
274274
}
275-
pointer = pointer + a.length;
275+
pointer = pointer + subDiff.length;
276276
}
277277
count_insert = 0;
278278
count_delete = 0;

java/src/name/fraser/neil/plaintext/diff_match_patch.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ private LinkedList<Diff> diff_compute(String text1, String text2,
293293
private LinkedList<Diff> diff_lineMode(String text1, String text2,
294294
long deadline) {
295295
// Scan the text on a line-by-line basis first.
296-
LinesToCharsResult b = diff_linesToChars(text1, text2);
297-
text1 = b.chars1;
298-
text2 = b.chars2;
299-
List<String> linearray = b.lineArray;
296+
LinesToCharsResult a = diff_linesToChars(text1, text2);
297+
text1 = a.chars1;
298+
text2 = a.chars2;
299+
List<String> linearray = a.lineArray;
300300

301301
LinkedList<Diff> diffs = diff_main(text1, text2, false, deadline);
302302

@@ -333,9 +333,9 @@ private LinkedList<Diff> diff_lineMode(String text1, String text2,
333333
pointer.previous();
334334
pointer.remove();
335335
}
336-
for (Diff newDiff : diff_main(text_delete, text_insert, false,
336+
for (Diff subDiff : diff_main(text_delete, text_insert, false,
337337
deadline)) {
338-
pointer.add(newDiff);
338+
pointer.add(subDiff);
339339
}
340340
}
341341
count_insert = 0;

javascript/diff_match_patch_uncompressed.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,12 @@ diff_match_patch.prototype.diff_lineMode_ = function(text1, text2, deadline) {
260260
diffs.splice(pointer - count_delete - count_insert,
261261
count_delete + count_insert);
262262
pointer = pointer - count_delete - count_insert;
263-
var a = this.diff_main(text_delete, text_insert, false, deadline);
264-
for (var j = a.length - 1; j >= 0; j--) {
265-
diffs.splice(pointer, 0, a[j]);
263+
var subDiff =
264+
this.diff_main(text_delete, text_insert, false, deadline);
265+
for (var j = subDiff.length - 1; j >= 0; j--) {
266+
diffs.splice(pointer, 0, subDiff[j]);
266267
}
267-
pointer = pointer + a.length;
268+
pointer = pointer + subDiff.length;
268269
}
269270
count_insert = 0;
270271
count_delete = 0;

objectivec/DiffMatchPatch.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,10 @@ - (NSMutableArray *)diff_lineModeFromOldString:(NSString *)text1
560560
deadline:(NSTimeInterval)deadline;
561561
{
562562
// Scan the text on a line-by-line basis first.
563-
NSArray *b = [self diff_linesToCharsForFirstString:text1 andSecondString:text2];
564-
text1 = (NSString *)[b objectAtIndex:0];
565-
text2 = (NSString *)[b objectAtIndex:1];
566-
NSMutableArray *linearray = (NSMutableArray *)[b objectAtIndex:2];
563+
NSArray *a = [self diff_linesToCharsForFirstString:text1 andSecondString:text2];
564+
text1 = (NSString *)[a objectAtIndex:0];
565+
text2 = (NSString *)[a objectAtIndex:1];
566+
NSMutableArray *linearray = (NSMutableArray *)[a objectAtIndex:2];
567567

568568
NSAutoreleasePool *recursePool = [NSAutoreleasePool new];
569569
NSMutableArray *diffs = [self diff_mainOfOldString:text1 andNewString:text2 checkLines:NO deadline:deadline];
@@ -599,16 +599,16 @@ - (NSMutableArray *)diff_lineModeFromOldString:(NSString *)text1
599599
// Upon reaching an equality, check for prior redundancies.
600600
if (count_delete >= 1 && count_insert >= 1) {
601601
// Delete the offending records and add the merged ones.
602-
NSMutableArray *a = [self diff_mainOfOldString:text_delete andNewString:text_insert checkLines:NO deadline:deadline];
602+
NSMutableArray *subDiff = [self diff_mainOfOldString:text_delete andNewString:text_insert checkLines:NO deadline:deadline];
603603
[diffs removeObjectsInRange:NSMakeRange(thisPointer - count_delete - count_insert,
604604
count_delete + count_insert)];
605605
thisPointer = thisPointer - count_delete - count_insert;
606606
NSUInteger insertionIndex = thisPointer;
607-
for (Diff *thisDiff in a) {
607+
for (Diff *thisDiff in subDiff) {
608608
[diffs insertObject:thisDiff atIndex:insertionIndex];
609609
insertionIndex++;
610610
}
611-
thisPointer = thisPointer + a.count;
611+
thisPointer = thisPointer + subDiff.count;
612612
}
613613
count_insert = 0;
614614
count_delete = 0;

python2/diff_match_patch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ def diff_lineMode(self, text1, text2, deadline):
239239
# Upon reaching an equality, check for prior redundancies.
240240
if count_delete >= 1 and count_insert >= 1:
241241
# Delete the offending records and add the merged ones.
242-
a = self.diff_main(text_delete, text_insert, False, deadline)
243-
diffs[pointer - count_delete - count_insert : pointer] = a
244-
pointer = pointer - count_delete - count_insert + len(a)
242+
subDiff = self.diff_main(text_delete, text_insert, False, deadline)
243+
diffs[pointer - count_delete - count_insert : pointer] = subDiff
244+
pointer = pointer - count_delete - count_insert + len(subDiff)
245245
count_insert = 0
246246
count_delete = 0
247247
text_delete = ''

python3/diff_match_patch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ def diff_lineMode(self, text1, text2, deadline):
237237
# Upon reaching an equality, check for prior redundancies.
238238
if count_delete >= 1 and count_insert >= 1:
239239
# Delete the offending records and add the merged ones.
240-
a = self.diff_main(text_delete, text_insert, False, deadline)
241-
diffs[pointer - count_delete - count_insert : pointer] = a
242-
pointer = pointer - count_delete - count_insert + len(a)
240+
subDiff = self.diff_main(text_delete, text_insert, False, deadline)
241+
diffs[pointer - count_delete - count_insert : pointer] = subDiff
242+
pointer = pointer - count_delete - count_insert + len(subDiff)
243243
count_insert = 0
244244
count_delete = 0
245245
text_delete = ''

0 commit comments

Comments
 (0)