Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc
This patch was automatically generated by the following script:
#!/bin/bash
# Command to convert PRUnichar to char16_t
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*modules/libmar*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name prtypes.h \
! -name Char16.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert PRUnichar char16_t
This commit is contained in:
@@ -58,41 +58,41 @@
|
||||
|
||||
#include "nsHtml5Tokenizer.h"
|
||||
|
||||
PRUnichar nsHtml5Tokenizer::LT_GT[] = { '<', '>' };
|
||||
PRUnichar nsHtml5Tokenizer::LT_SOLIDUS[] = { '<', '/' };
|
||||
PRUnichar nsHtml5Tokenizer::RSQB_RSQB[] = { ']', ']' };
|
||||
PRUnichar nsHtml5Tokenizer::REPLACEMENT_CHARACTER[] = { 0xfffd };
|
||||
PRUnichar nsHtml5Tokenizer::LF[] = { '\n' };
|
||||
PRUnichar nsHtml5Tokenizer::CDATA_LSQB[] = { 'C', 'D', 'A', 'T', 'A', '[' };
|
||||
PRUnichar nsHtml5Tokenizer::OCTYPE[] = { 'o', 'c', 't', 'y', 'p', 'e' };
|
||||
PRUnichar nsHtml5Tokenizer::UBLIC[] = { 'u', 'b', 'l', 'i', 'c' };
|
||||
PRUnichar nsHtml5Tokenizer::YSTEM[] = { 'y', 's', 't', 'e', 'm' };
|
||||
static PRUnichar const TITLE_ARR_DATA[] = { 't', 'i', 't', 'l', 'e' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::TITLE_ARR = { TITLE_ARR_DATA, MOZ_ARRAY_LENGTH(TITLE_ARR_DATA) };
|
||||
static PRUnichar const SCRIPT_ARR_DATA[] = { 's', 'c', 'r', 'i', 'p', 't' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::SCRIPT_ARR = { SCRIPT_ARR_DATA, MOZ_ARRAY_LENGTH(SCRIPT_ARR_DATA) };
|
||||
static PRUnichar const STYLE_ARR_DATA[] = { 's', 't', 'y', 'l', 'e' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::STYLE_ARR = { STYLE_ARR_DATA, MOZ_ARRAY_LENGTH(STYLE_ARR_DATA) };
|
||||
static PRUnichar const PLAINTEXT_ARR_DATA[] = { 'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::PLAINTEXT_ARR = { PLAINTEXT_ARR_DATA, MOZ_ARRAY_LENGTH(PLAINTEXT_ARR_DATA) };
|
||||
static PRUnichar const XMP_ARR_DATA[] = { 'x', 'm', 'p' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::XMP_ARR = { XMP_ARR_DATA, MOZ_ARRAY_LENGTH(XMP_ARR_DATA) };
|
||||
static PRUnichar const TEXTAREA_ARR_DATA[] = { 't', 'e', 'x', 't', 'a', 'r', 'e', 'a' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::TEXTAREA_ARR = { TEXTAREA_ARR_DATA, MOZ_ARRAY_LENGTH(TEXTAREA_ARR_DATA) };
|
||||
static PRUnichar const IFRAME_ARR_DATA[] = { 'i', 'f', 'r', 'a', 'm', 'e' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::IFRAME_ARR = { IFRAME_ARR_DATA, MOZ_ARRAY_LENGTH(IFRAME_ARR_DATA) };
|
||||
static PRUnichar const NOEMBED_ARR_DATA[] = { 'n', 'o', 'e', 'm', 'b', 'e', 'd' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::NOEMBED_ARR = { NOEMBED_ARR_DATA, MOZ_ARRAY_LENGTH(NOEMBED_ARR_DATA) };
|
||||
static PRUnichar const NOSCRIPT_ARR_DATA[] = { 'n', 'o', 's', 'c', 'r', 'i', 'p', 't' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::NOSCRIPT_ARR = { NOSCRIPT_ARR_DATA, MOZ_ARRAY_LENGTH(NOSCRIPT_ARR_DATA) };
|
||||
static PRUnichar const NOFRAMES_ARR_DATA[] = { 'n', 'o', 'f', 'r', 'a', 'm', 'e', 's' };
|
||||
staticJArray<PRUnichar,int32_t> nsHtml5Tokenizer::NOFRAMES_ARR = { NOFRAMES_ARR_DATA, MOZ_ARRAY_LENGTH(NOFRAMES_ARR_DATA) };
|
||||
char16_t nsHtml5Tokenizer::LT_GT[] = { '<', '>' };
|
||||
char16_t nsHtml5Tokenizer::LT_SOLIDUS[] = { '<', '/' };
|
||||
char16_t nsHtml5Tokenizer::RSQB_RSQB[] = { ']', ']' };
|
||||
char16_t nsHtml5Tokenizer::REPLACEMENT_CHARACTER[] = { 0xfffd };
|
||||
char16_t nsHtml5Tokenizer::LF[] = { '\n' };
|
||||
char16_t nsHtml5Tokenizer::CDATA_LSQB[] = { 'C', 'D', 'A', 'T', 'A', '[' };
|
||||
char16_t nsHtml5Tokenizer::OCTYPE[] = { 'o', 'c', 't', 'y', 'p', 'e' };
|
||||
char16_t nsHtml5Tokenizer::UBLIC[] = { 'u', 'b', 'l', 'i', 'c' };
|
||||
char16_t nsHtml5Tokenizer::YSTEM[] = { 'y', 's', 't', 'e', 'm' };
|
||||
static char16_t const TITLE_ARR_DATA[] = { 't', 'i', 't', 'l', 'e' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::TITLE_ARR = { TITLE_ARR_DATA, MOZ_ARRAY_LENGTH(TITLE_ARR_DATA) };
|
||||
static char16_t const SCRIPT_ARR_DATA[] = { 's', 'c', 'r', 'i', 'p', 't' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::SCRIPT_ARR = { SCRIPT_ARR_DATA, MOZ_ARRAY_LENGTH(SCRIPT_ARR_DATA) };
|
||||
static char16_t const STYLE_ARR_DATA[] = { 's', 't', 'y', 'l', 'e' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::STYLE_ARR = { STYLE_ARR_DATA, MOZ_ARRAY_LENGTH(STYLE_ARR_DATA) };
|
||||
static char16_t const PLAINTEXT_ARR_DATA[] = { 'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::PLAINTEXT_ARR = { PLAINTEXT_ARR_DATA, MOZ_ARRAY_LENGTH(PLAINTEXT_ARR_DATA) };
|
||||
static char16_t const XMP_ARR_DATA[] = { 'x', 'm', 'p' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::XMP_ARR = { XMP_ARR_DATA, MOZ_ARRAY_LENGTH(XMP_ARR_DATA) };
|
||||
static char16_t const TEXTAREA_ARR_DATA[] = { 't', 'e', 'x', 't', 'a', 'r', 'e', 'a' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::TEXTAREA_ARR = { TEXTAREA_ARR_DATA, MOZ_ARRAY_LENGTH(TEXTAREA_ARR_DATA) };
|
||||
static char16_t const IFRAME_ARR_DATA[] = { 'i', 'f', 'r', 'a', 'm', 'e' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::IFRAME_ARR = { IFRAME_ARR_DATA, MOZ_ARRAY_LENGTH(IFRAME_ARR_DATA) };
|
||||
static char16_t const NOEMBED_ARR_DATA[] = { 'n', 'o', 'e', 'm', 'b', 'e', 'd' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::NOEMBED_ARR = { NOEMBED_ARR_DATA, MOZ_ARRAY_LENGTH(NOEMBED_ARR_DATA) };
|
||||
static char16_t const NOSCRIPT_ARR_DATA[] = { 'n', 'o', 's', 'c', 'r', 'i', 'p', 't' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::NOSCRIPT_ARR = { NOSCRIPT_ARR_DATA, MOZ_ARRAY_LENGTH(NOSCRIPT_ARR_DATA) };
|
||||
static char16_t const NOFRAMES_ARR_DATA[] = { 'n', 'o', 'f', 'r', 'a', 'm', 'e', 's' };
|
||||
staticJArray<char16_t,int32_t> nsHtml5Tokenizer::NOFRAMES_ARR = { NOFRAMES_ARR_DATA, MOZ_ARRAY_LENGTH(NOFRAMES_ARR_DATA) };
|
||||
|
||||
nsHtml5Tokenizer::nsHtml5Tokenizer(nsHtml5TreeBuilder* tokenHandler, bool viewingXmlSource)
|
||||
: tokenHandler(tokenHandler),
|
||||
encodingDeclarationHandler(nullptr),
|
||||
bmpChar(jArray<PRUnichar,int32_t>::newJArray(1)),
|
||||
astralChar(jArray<PRUnichar,int32_t>::newJArray(2)),
|
||||
bmpChar(jArray<char16_t,int32_t>::newJArray(1)),
|
||||
astralChar(jArray<char16_t,int32_t>::newJArray(2)),
|
||||
tagName(nullptr),
|
||||
attributeName(nullptr),
|
||||
doctypeName(nullptr),
|
||||
@@ -130,7 +130,7 @@ nsHtml5Tokenizer::setStateAndEndTagExpectation(int32_t specialTokenizerState, ns
|
||||
if (specialTokenizerState == NS_HTML5TOKENIZER_DATA) {
|
||||
return;
|
||||
}
|
||||
autoJArray<PRUnichar,int32_t> asArray = nsHtml5Portability::newCharArrayFromLocal(endTagExpectation);
|
||||
autoJArray<char16_t,int32_t> asArray = nsHtml5Portability::newCharArrayFromLocal(endTagExpectation);
|
||||
this->endTagExpectation = nsHtml5ElementName::elementNameByBuffer(asArray, 0, asArray.length, interner);
|
||||
endTagExpectationToArray();
|
||||
}
|
||||
@@ -207,10 +207,10 @@ nsHtml5Tokenizer::emptyAttributes()
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::appendStrBuf(PRUnichar c)
|
||||
nsHtml5Tokenizer::appendStrBuf(char16_t c)
|
||||
{
|
||||
if (strBufLen == strBuf.length) {
|
||||
jArray<PRUnichar,int32_t> newBuf = jArray<PRUnichar,int32_t>::newJArray(strBuf.length + NS_HTML5TOKENIZER_BUFFER_GROW_BY);
|
||||
jArray<char16_t,int32_t> newBuf = jArray<char16_t,int32_t>::newJArray(strBuf.length + NS_HTML5TOKENIZER_BUFFER_GROW_BY);
|
||||
nsHtml5ArrayCopy::arraycopy(strBuf, newBuf, strBuf.length);
|
||||
strBuf = newBuf;
|
||||
}
|
||||
@@ -238,10 +238,10 @@ nsHtml5Tokenizer::emitStrBuf()
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::appendLongStrBuf(PRUnichar c)
|
||||
nsHtml5Tokenizer::appendLongStrBuf(char16_t c)
|
||||
{
|
||||
if (longStrBufLen == longStrBuf.length) {
|
||||
jArray<PRUnichar,int32_t> newBuf = jArray<PRUnichar,int32_t>::newJArray(longStrBufLen + (longStrBufLen >> 1));
|
||||
jArray<char16_t,int32_t> newBuf = jArray<char16_t,int32_t>::newJArray(longStrBufLen + (longStrBufLen >> 1));
|
||||
nsHtml5ArrayCopy::arraycopy(longStrBuf, newBuf, longStrBuf.length);
|
||||
longStrBuf = newBuf;
|
||||
}
|
||||
@@ -249,11 +249,11 @@ nsHtml5Tokenizer::appendLongStrBuf(PRUnichar c)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::appendLongStrBuf(PRUnichar* buffer, int32_t offset, int32_t length)
|
||||
nsHtml5Tokenizer::appendLongStrBuf(char16_t* buffer, int32_t offset, int32_t length)
|
||||
{
|
||||
int32_t reqLen = longStrBufLen + length;
|
||||
if (longStrBuf.length < reqLen) {
|
||||
jArray<PRUnichar,int32_t> newBuf = jArray<PRUnichar,int32_t>::newJArray(reqLen + (reqLen >> 1));
|
||||
jArray<char16_t,int32_t> newBuf = jArray<char16_t,int32_t>::newJArray(reqLen + (reqLen >> 1));
|
||||
nsHtml5ArrayCopy::arraycopy(longStrBuf, newBuf, longStrBuf.length);
|
||||
longStrBuf = newBuf;
|
||||
}
|
||||
@@ -275,7 +275,7 @@ nsHtml5Tokenizer::emitComment(int32_t provisionalHyphens, int32_t pos)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::flushChars(PRUnichar* buf, int32_t pos)
|
||||
nsHtml5Tokenizer::flushChars(char16_t* buf, int32_t pos)
|
||||
{
|
||||
if (pos > cstart) {
|
||||
tokenHandler->characters(buf, cstart, pos - cstart);
|
||||
@@ -370,7 +370,7 @@ nsHtml5Tokenizer::tokenizeBuffer(nsHtml5UTF16Buffer* buffer)
|
||||
{
|
||||
int32_t state = stateSave;
|
||||
int32_t returnState = returnStateSave;
|
||||
PRUnichar c = '\0';
|
||||
char16_t c = '\0';
|
||||
shouldSuspend = false;
|
||||
lastCR = false;
|
||||
int32_t start = buffer->getStart();
|
||||
@@ -418,7 +418,7 @@ nsHtml5Tokenizer::tokenizeBuffer(nsHtml5UTF16Buffer* buffer)
|
||||
|
||||
template<class P>
|
||||
int32_t
|
||||
nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar* buf, bool reconsume, int32_t returnState, int32_t endPos)
|
||||
nsHtml5Tokenizer::stateLoop(int32_t state, char16_t c, int32_t pos, char16_t* buf, bool reconsume, int32_t returnState, int32_t endPos)
|
||||
{
|
||||
stateloop: for (; ; ) {
|
||||
switch(state) {
|
||||
@@ -472,7 +472,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
c = checkChar(buf, pos);
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
endTag = false;
|
||||
clearStrBufAndAppend((PRUnichar) (c + 0x20));
|
||||
clearStrBufAndAppend((char16_t) (c + 0x20));
|
||||
state = P::transition(mViewSource, NS_HTML5TOKENIZER_TAG_NAME, reconsume, pos);
|
||||
NS_HTML5_BREAK(tagopenloop);
|
||||
} else if (c >= 'a' && c <= 'z') {
|
||||
@@ -1605,7 +1605,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
const nsHtml5CharacterName& candidateName = nsHtml5NamedCharacters::NAMES[candidate];
|
||||
if (!candidateName.length() || candidateName.charAt(candidateName.length() - 1) != ';') {
|
||||
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
|
||||
PRUnichar ch;
|
||||
char16_t ch;
|
||||
if (strBufMark == strBufLen) {
|
||||
ch = c;
|
||||
} else {
|
||||
@@ -1632,7 +1632,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
}
|
||||
P::completedNamedCharacterReference(mViewSource);
|
||||
const PRUnichar* val = nsHtml5NamedCharacters::VALUES[candidate];
|
||||
const char16_t* val = nsHtml5NamedCharacters::VALUES[candidate];
|
||||
if (!val[1]) {
|
||||
emitOrAppendOne(val, returnState);
|
||||
} else {
|
||||
@@ -2010,8 +2010,8 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
if (index < endTagExpectationAsArray.length) {
|
||||
PRUnichar e = endTagExpectationAsArray[index];
|
||||
PRUnichar folded = c;
|
||||
char16_t e = endTagExpectationAsArray[index];
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -2409,7 +2409,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
c = checkChar(buf, pos);
|
||||
MOZ_ASSERT(index > 0);
|
||||
if (index < 6) {
|
||||
PRUnichar folded = c;
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -2587,7 +2587,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
if (index < 6) {
|
||||
PRUnichar folded = c;
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -2632,7 +2632,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
if (index < 6) {
|
||||
PRUnichar folded = c;
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -2836,7 +2836,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
if (index < 5) {
|
||||
PRUnichar folded = c;
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -3207,7 +3207,7 @@ nsHtml5Tokenizer::stateLoop(int32_t state, PRUnichar c, int32_t pos, PRUnichar*
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
if (index < 5) {
|
||||
PRUnichar folded = c;
|
||||
char16_t folded = c;
|
||||
if (c >= 'A' && c <= 'Z') {
|
||||
folded += 0x20;
|
||||
}
|
||||
@@ -3472,7 +3472,7 @@ nsHtml5Tokenizer::initDoctypeFields()
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::emitCarriageReturn(PRUnichar* buf, int32_t pos)
|
||||
nsHtml5Tokenizer::emitCarriageReturn(char16_t* buf, int32_t pos)
|
||||
{
|
||||
silentCarriageReturn();
|
||||
flushChars(buf, pos);
|
||||
@@ -3481,7 +3481,7 @@ nsHtml5Tokenizer::emitCarriageReturn(PRUnichar* buf, int32_t pos)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::emitReplacementCharacter(PRUnichar* buf, int32_t pos)
|
||||
nsHtml5Tokenizer::emitReplacementCharacter(char16_t* buf, int32_t pos)
|
||||
{
|
||||
flushChars(buf, pos);
|
||||
tokenHandler->zeroOriginatingReplacementCharacter();
|
||||
@@ -3489,7 +3489,7 @@ nsHtml5Tokenizer::emitReplacementCharacter(PRUnichar* buf, int32_t pos)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::emitPlaintextReplacementCharacter(PRUnichar* buf, int32_t pos)
|
||||
nsHtml5Tokenizer::emitPlaintextReplacementCharacter(char16_t* buf, int32_t pos)
|
||||
{
|
||||
flushChars(buf, pos);
|
||||
tokenHandler->characters(REPLACEMENT_CHARACTER, 0, 1);
|
||||
@@ -3497,7 +3497,7 @@ nsHtml5Tokenizer::emitPlaintextReplacementCharacter(PRUnichar* buf, int32_t pos)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::setAdditionalAndRememberAmpersandLocation(PRUnichar add)
|
||||
nsHtml5Tokenizer::setAdditionalAndRememberAmpersandLocation(char16_t add)
|
||||
{
|
||||
additional = add;
|
||||
}
|
||||
@@ -3532,7 +3532,7 @@ nsHtml5Tokenizer::handleNcrValue(int32_t returnState)
|
||||
if (value <= 0xFFFF) {
|
||||
if (value >= 0x80 && value <= 0x9f) {
|
||||
errNcrInC1Range();
|
||||
PRUnichar* val = nsHtml5NamedCharacters::WINDOWS_1252[value - 0x80];
|
||||
char16_t* val = nsHtml5NamedCharacters::WINDOWS_1252[value - 0x80];
|
||||
emitOrAppendOne(val, returnState);
|
||||
} else if (value == 0x0) {
|
||||
errNcrZero();
|
||||
@@ -3541,13 +3541,13 @@ nsHtml5Tokenizer::handleNcrValue(int32_t returnState)
|
||||
errNcrSurrogate();
|
||||
emitOrAppendOne(nsHtml5Tokenizer::REPLACEMENT_CHARACTER, returnState);
|
||||
} else {
|
||||
PRUnichar ch = (PRUnichar) value;
|
||||
char16_t ch = (char16_t) value;
|
||||
bmpChar[0] = ch;
|
||||
emitOrAppendOne(bmpChar, returnState);
|
||||
}
|
||||
} else if (value <= 0x10FFFF) {
|
||||
astralChar[0] = (PRUnichar) (NS_HTML5TOKENIZER_LEAD_OFFSET + (value >> 10));
|
||||
astralChar[1] = (PRUnichar) (0xDC00 + (value & 0x3FF));
|
||||
astralChar[0] = (char16_t) (NS_HTML5TOKENIZER_LEAD_OFFSET + (value >> 10));
|
||||
astralChar[1] = (char16_t) (0xDC00 + (value & 0x3FF));
|
||||
emitOrAppendTwo(astralChar, returnState);
|
||||
} else {
|
||||
errNcrOutOfRange();
|
||||
@@ -3745,7 +3745,7 @@ nsHtml5Tokenizer::eof()
|
||||
}
|
||||
case NS_HTML5TOKENIZER_CHARACTER_REFERENCE_TAIL: {
|
||||
for (; ; ) {
|
||||
PRUnichar c = '\0';
|
||||
char16_t c = '\0';
|
||||
entCol++;
|
||||
for (; ; ) {
|
||||
if (hi == -1) {
|
||||
@@ -3795,7 +3795,7 @@ nsHtml5Tokenizer::eof()
|
||||
const nsHtml5CharacterName& candidateName = nsHtml5NamedCharacters::NAMES[candidate];
|
||||
if (!candidateName.length() || candidateName.charAt(candidateName.length() - 1) != ';') {
|
||||
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
|
||||
PRUnichar ch;
|
||||
char16_t ch;
|
||||
if (strBufMark == strBufLen) {
|
||||
ch = '\0';
|
||||
} else {
|
||||
@@ -3814,7 +3814,7 @@ nsHtml5Tokenizer::eof()
|
||||
errNotSemicolonTerminated();
|
||||
}
|
||||
}
|
||||
const PRUnichar* val = nsHtml5NamedCharacters::VALUES[candidate];
|
||||
const char16_t* val = nsHtml5NamedCharacters::VALUES[candidate];
|
||||
if (!val[1]) {
|
||||
emitOrAppendOne(val, returnState);
|
||||
} else {
|
||||
@@ -3889,7 +3889,7 @@ nsHtml5Tokenizer::internalEncodingDeclaration(nsString* internalCharset)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::emitOrAppendTwo(const PRUnichar* val, int32_t returnState)
|
||||
nsHtml5Tokenizer::emitOrAppendTwo(const char16_t* val, int32_t returnState)
|
||||
{
|
||||
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
|
||||
appendLongStrBuf(val[0]);
|
||||
@@ -3900,7 +3900,7 @@ nsHtml5Tokenizer::emitOrAppendTwo(const PRUnichar* val, int32_t returnState)
|
||||
}
|
||||
|
||||
void
|
||||
nsHtml5Tokenizer::emitOrAppendOne(const PRUnichar* val, int32_t returnState)
|
||||
nsHtml5Tokenizer::emitOrAppendOne(const char16_t* val, int32_t returnState)
|
||||
{
|
||||
if ((returnState & NS_HTML5TOKENIZER_DATA_AND_RCDATA_MASK)) {
|
||||
appendLongStrBuf(val[0]);
|
||||
@@ -3992,12 +3992,12 @@ nsHtml5Tokenizer::loadState(nsHtml5Tokenizer* other)
|
||||
{
|
||||
strBufLen = other->strBufLen;
|
||||
if (strBufLen > strBuf.length) {
|
||||
strBuf = jArray<PRUnichar,int32_t>::newJArray(strBufLen);
|
||||
strBuf = jArray<char16_t,int32_t>::newJArray(strBufLen);
|
||||
}
|
||||
nsHtml5ArrayCopy::arraycopy(other->strBuf, strBuf, strBufLen);
|
||||
longStrBufLen = other->longStrBufLen;
|
||||
if (longStrBufLen > longStrBuf.length) {
|
||||
longStrBuf = jArray<PRUnichar,int32_t>::newJArray(longStrBufLen);
|
||||
longStrBuf = jArray<char16_t,int32_t>::newJArray(longStrBufLen);
|
||||
}
|
||||
nsHtml5ArrayCopy::arraycopy(other->longStrBuf, longStrBuf, longStrBufLen);
|
||||
stateSave = other->stateSave;
|
||||
@@ -4064,8 +4064,8 @@ void
|
||||
nsHtml5Tokenizer::initializeWithoutStarting()
|
||||
{
|
||||
confident = false;
|
||||
strBuf = jArray<PRUnichar,int32_t>::newJArray(64);
|
||||
longStrBuf = jArray<PRUnichar,int32_t>::newJArray(1024);
|
||||
strBuf = jArray<char16_t,int32_t>::newJArray(64);
|
||||
longStrBuf = jArray<char16_t,int32_t>::newJArray(1024);
|
||||
line = 1;
|
||||
resetToDataState();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user