We know exactly how many lines we need by the time we compute our per-line hashes, as we have already built the lines IntList to give us the starting position of each line in the buffer. Using that we can properly size the array, and don't need the dynamic growing feature of IntList. So drop the indirection and just use a fixed size array. Change-Id: I5c8c592514692a8abff51e5928aedcf71e100365 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>tags/v0.9.1
@@ -95,7 +95,7 @@ public class RawText implements Sequence { | |||
protected final IntList lines; | |||
/** Hash code for each line, for fast equality elimination. */ | |||
protected final IntList hashes; | |||
protected final int[] hashes; | |||
/** | |||
* Create a new sequence from an existing content byte array. | |||
@@ -140,7 +140,7 @@ public class RawText implements Sequence { | |||
private static boolean equals(final RawText a, final int ai, | |||
final RawText b, final int bi) { | |||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||
if (a.hashes[ai] != b.hashes[bi]) | |||
return false; | |||
int as = a.lines.get(ai); | |||
@@ -197,15 +197,13 @@ public class RawText implements Sequence { | |||
return content[end - 1] != '\n'; | |||
} | |||
private IntList computeHashes() { | |||
final IntList r = new IntList(lines.size()); | |||
r.add(0); | |||
private int[] computeHashes() { | |||
final int[] r = new int[lines.size()]; | |||
for (int lno = 1; lno < lines.size() - 1; lno++) { | |||
final int ptr = lines.get(lno); | |||
final int end = lines.get(lno + 1); | |||
r.add(hashLine(content, ptr, end)); | |||
r[lno] = hashLine(content, ptr, end); | |||
} | |||
r.add(0); | |||
return r; | |||
} | |||
@@ -79,7 +79,7 @@ public class RawTextIgnoreAllWhitespace extends RawText { | |||
private static boolean equals(final RawText a, final int ai, | |||
final RawText b, final int bi) { | |||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||
if (a.hashes[ai] != b.hashes[bi]) | |||
return false; | |||
int as = a.lines.get(ai); |
@@ -78,7 +78,7 @@ public class RawTextIgnoreLeadingWhitespace extends RawText { | |||
private static boolean equals(final RawText a, final int ai, | |||
final RawText b, final int bi) { | |||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||
if (a.hashes[ai] != b.hashes[bi]) | |||
return false; | |||
int as = a.lines.get(ai); |
@@ -78,7 +78,7 @@ public class RawTextIgnoreTrailingWhitespace extends RawText { | |||
private static boolean equals(final RawText a, final int ai, | |||
final RawText b, final int bi) { | |||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||
if (a.hashes[ai] != b.hashes[bi]) | |||
return false; | |||
int as = a.lines.get(ai); |
@@ -81,7 +81,7 @@ public class RawTextIgnoreWhitespaceChange extends RawText { | |||
private static boolean equals(final RawText a, final int ai, | |||
final RawText b, final int bi) { | |||
if (a.hashes.get(ai) != b.hashes.get(bi)) | |||
if (a.hashes[ai] != b.hashes[bi]) | |||
return false; | |||
int as = a.lines.get(ai); |