corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 502176 - Replace static use of jArray with a plain old data staticJArray, introduce an autoJArray for nicer memory management. r=tglek, a=jst.

Browse Source
This commit is contained in:
Henri Sivonen
2010-09-28 10:32:31 +03:00
parent 3d72e29d09
commit a00ca20e07
28 changed files with 1181 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
parser/html/javasrc/Tokenizer.java
View File

@@ -35,6 +35,7 @@
package nu.validator.htmlparser.impl;
import nu.validator.htmlparser.annotation.Auto;
import nu.validator.htmlparser.annotation.Const;
import nu.validator.htmlparser.annotation.Inline;
import nu.validator.htmlparser.annotation.Local;
@@ -372,7 +373,7 @@ public class Tokenizer implements Locator {
/**
* Buffer for short identifiers.
*/
private char[] strBuf;
private @Auto char[] strBuf;
/**
* Number of significant <code>char</code>s in <code>strBuf</code>.
@@ -387,7 +388,7 @@ public class Tokenizer implements Locator {
/**
* Buffer for long strings.
*/
private char[] longStrBuf;
private @Auto char[] longStrBuf;
/**
* Number of significant <code>char</code>s in <code>longStrBuf</code>.
@@ -403,19 +404,19 @@ public class Tokenizer implements Locator {
/**
* Buffer for expanding NCRs falling into the Basic Multilingual Plane.
*/
private final char[] bmpChar;
private final @Auto char[] bmpChar;
/**
* Buffer for expanding astral NCRs.
*/
private final char[] astralChar;
private final @Auto char[] astralChar;
/**
* The element whose end tag closes the current CDATA or RCDATA element.
*/
protected ElementName endTagExpectation = null;
private char[] endTagExpectationAsArray;
private char[] endTagExpectationAsArray; // not @Auto!
/**
* <code>true</code> if tokenizing an end tag
@@ -555,11 +556,6 @@ public class Tokenizer implements Locator {
}
void destructor() {
Portability.releaseArray(bmpChar);
Portability.releaseArray(astralChar);
}
// [NOCPP[
/**
@@ -676,10 +672,9 @@ public class Tokenizer implements Locator {
if (specialTokenizerState == Tokenizer.DATA) {
return;
}
char[] asArray = Portability.newCharArrayFromLocal(endTagExpectation);
@Auto char[] asArray = Portability.newCharArrayFromLocal(endTagExpectation);
this.endTagExpectation = ElementName.elementNameByBuffer(asArray, 0,
asArray.length, interner);
Portability.releaseArray(asArray);
endTagExpectationToArray();
}
@@ -822,7 +817,6 @@ public class Tokenizer implements Locator {
if (strBufLen == strBuf.length) {
char[] newBuf = new char[strBuf.length + Tokenizer.BUFFER_GROW_BY];
System.arraycopy(strBuf, 0, newBuf, 0, strBuf.length);
Portability.releaseArray(strBuf);
strBuf = newBuf;
}
strBuf[strBufLen++] = c;
@@ -882,7 +876,6 @@ public class Tokenizer implements Locator {
if (longStrBufLen == longStrBuf.length) {
char[] newBuf = new char[longStrBufLen + (longStrBufLen >> 1)];
System.arraycopy(longStrBuf, 0, newBuf, 0, longStrBuf.length);
Portability.releaseArray(longStrBuf);
longStrBuf = newBuf;
}
longStrBuf[longStrBufLen++] = c;
@@ -950,12 +943,11 @@ public class Tokenizer implements Locator {
// ]NOCPP]
}
private void appendLongStrBuf(char[] buffer, int offset, int length) {
private void appendLongStrBuf(@NoLength char[] buffer, int offset, int length) {
int reqLen = longStrBufLen + length;
if (longStrBuf.length < reqLen) {
char[] newBuf = new char[reqLen + (reqLen >> 1)];
System.arraycopy(longStrBuf, 0, newBuf, 0, longStrBuf.length);
Portability.releaseArray(longStrBuf);
longStrBuf = newBuf;
}
System.arraycopy(buffer, offset, longStrBuf, longStrBufLen, length);
@@ -6492,9 +6484,7 @@ public class Tokenizer implements Locator {
}
public void end() throws SAXException {
Portability.releaseArray(strBuf);
strBuf = null;
Portability.releaseArray(longStrBuf);
longStrBuf = null;
Portability.releaseLocal(doctypeName);
doctypeName = null;
@@ -6581,7 +6571,7 @@ public class Tokenizer implements Locator {
entCol = -1;
firstCharKey = -1;
lo = 0;
hi = (NamedCharacters.NAMES.length - 1);
hi = 0; // will always be overwritten before use anyway
candidate = -1;
strBufMark = 0;
prevValue = -1;
@@ -6613,14 +6603,12 @@ public class Tokenizer implements Locator {
public void loadState(Tokenizer other) throws SAXException {
strBufLen = other.strBufLen;
if (strBufLen > strBuf.length) {
Portability.releaseArray(strBuf);
strBuf = new char[strBufLen];
}
System.arraycopy(other.strBuf, 0, strBuf, 0, strBufLen);
longStrBufLen = other.longStrBufLen;
if (longStrBufLen > longStrBuf.length) {
Portability.releaseArray(longStrBuf);
longStrBuf = new char[longStrBufLen];
}
System.arraycopy(other.longStrBuf, 0, longStrBuf, 0, longStrBufLen);