Bug 1424548 - Part 11: Regenerate HTML parser code with MOZ_FALLTHROUGH annotations. r=hsivonen

And stop suppressing -Wimplicit-fallthrough warnings. We no longer need to suppress these clang warnings because the generated parser code now includes MOZ_FALLTHROUGH annotations.

--HG--
extra : rebase_source : d766c9b17de878138df6d949ee720dfaf0ed370a
This commit is contained in:
Chris Peterson 2017-12-01 01:05:26 -08:00
parent fcb45bc490
commit 5b8dabf526
7 changed files with 314 additions and 149 deletions

View File

@ -232,7 +232,7 @@ public abstract class MetaScanner {
continue;
}
}
// WARNING FALLTHRU CASE TRANSITION: DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case TAG_OPEN:
tagopenloop: for (;;) {
c = read();
@ -267,7 +267,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALL THROUGH DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case TAG_NAME:
tagnameloop: for (;;) {
c = read();
@ -316,7 +316,7 @@ public abstract class MetaScanner {
continue;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case BEFORE_ATTRIBUTE_NAME:
beforeattributenameloop: for (;;) {
if (reconsume) {
@ -370,7 +370,7 @@ public abstract class MetaScanner {
// continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case ATTRIBUTE_NAME:
attributenameloop: for (;;) {
c = read();
@ -422,7 +422,7 @@ public abstract class MetaScanner {
continue;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case BEFORE_ATTRIBUTE_VALUE:
beforeattributevalueloop: for (;;) {
c = read();
@ -453,7 +453,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case ATTRIBUTE_VALUE_DOUBLE_QUOTED:
attributevaluedoublequotedloop: for (;;) {
if (reconsume) {
@ -474,7 +474,7 @@ public abstract class MetaScanner {
continue;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case AFTER_ATTRIBUTE_VALUE_QUOTED:
afterattributevaluequotedloop: for (;;) {
c = read();
@ -503,7 +503,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case SELF_CLOSING_START_TAG:
c = read();
switch (c) {
@ -520,7 +520,6 @@ public abstract class MetaScanner {
reconsume = true;
continue stateloop;
}
// XXX reorder point
case ATTRIBUTE_VALUE_UNQUOTED:
for (;;) {
if (reconsume) {
@ -551,7 +550,6 @@ public abstract class MetaScanner {
continue;
}
}
// XXX reorder point
case AFTER_ATTRIBUTE_NAME:
for (;;) {
c = read();
@ -592,7 +590,6 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// XXX reorder point
case MARKUP_DECLARATION_OPEN:
markupdeclarationopenloop: for (;;) {
c = read();
@ -609,7 +606,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case MARKUP_DECLARATION_HYPHEN:
markupdeclarationhyphenloop: for (;;) {
c = read();
@ -626,7 +623,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case COMMENT_START:
commentstartloop: for (;;) {
c = read();
@ -645,7 +642,7 @@ public abstract class MetaScanner {
// continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case COMMENT:
commentloop: for (;;) {
c = read();
@ -660,7 +657,7 @@ public abstract class MetaScanner {
continue;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case COMMENT_END_DASH:
commentenddashloop: for (;;) {
c = read();
@ -676,7 +673,7 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// FALLTHRU DON'T REORDER
// CPPONLY: MOZ_FALLTHROUGH;
case COMMENT_END:
for (;;) {
c = read();
@ -693,7 +690,6 @@ public abstract class MetaScanner {
continue stateloop;
}
}
// XXX reorder point
case COMMENT_START_DASH:
c = read();
switch (c) {
@ -709,7 +705,6 @@ public abstract class MetaScanner {
state = MetaScanner.COMMENT;
continue stateloop;
}
// XXX reorder point
case ATTRIBUTE_VALUE_SINGLE_QUOTED:
for (;;) {
if (reconsume) {
@ -729,7 +724,6 @@ public abstract class MetaScanner {
continue;
}
}
// XXX reorder point
case SCAN_UNTIL_GT:
for (;;) {
if (reconsume) {

File diff suppressed because it is too large Load Diff

View File

@ -1072,7 +1072,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
if (!isInForeignButNotHtmlOrMathTextIntegrationPoint()) {
reconstructTheActiveFormattingElements();
}
// fall through
// CPPONLY: MOZ_FALLTHROUGH;
case TEXT:
accumulateCharacters(buf, start, length);
return;
@ -1573,6 +1573,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
}
// fall through to IN_TEMPLATE
// CPPONLY: MOZ_FALLTHROUGH;
case IN_TEMPLATE:
int eltPos = findLast("template");
if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) {
@ -1738,7 +1739,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
continue starttagloop;
} // else fall thru
}
// else fall thru
// CPPONLY: MOZ_FALLTHROUGH;
default:
if ("http://www.w3.org/2000/svg" == currNs) {
attributes.adjustForSvg();
@ -1866,6 +1867,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_TABLE
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_TABLE_BODY:
switch (group) {
case TR:
@ -1902,6 +1904,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_TABLE
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_TABLE:
intableloop: for (;;) {
switch (group) {
@ -2017,6 +2020,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
break intableloop;
}
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_CAPTION:
switch (group) {
case CAPTION:
@ -2043,6 +2047,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_CELL:
switch (group) {
case CAPTION:
@ -2062,6 +2067,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case FRAMESET_OK:
switch (group) {
case FRAMESET:
@ -2113,10 +2119,11 @@ public abstract class TreeBuilder<T> implements TokenHandler,
framesetOk = false;
mode = IN_BODY;
}
// fall through to IN_BODY
// CPPONLY: MOZ_FALLTHROUGH;
default:
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_BODY:
inbodyloop: for (;;) {
switch (group) {
@ -2333,6 +2340,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
case AREA_OR_WBR:
reconstructTheActiveFormattingElements();
// FALL THROUGH to PARAM_OR_SOURCE_OR_TRACK
// CPPONLY: MOZ_FALLTHROUGH;
// CPPONLY: case MENUITEM:
case PARAM_OR_SOURCE_OR_TRACK:
appendVoidElementToCurrentMayFoster(
@ -2394,9 +2402,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
attributes);
attributes = null; // CPP
break starttagloop;
} else {
// fall through
}
// CPPONLY: MOZ_FALLTHROUGH;
case NOFRAMES:
case IFRAME:
case NOEMBED:
@ -2524,6 +2531,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
break starttagloop;
}
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_HEAD:
inheadloop: for (;;) {
switch (group) {
@ -2590,6 +2598,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
continue starttagloop;
}
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_HEAD_NOSCRIPT:
switch (group) {
case HTML:
@ -2690,6 +2699,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_SELECT
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_SELECT:
switch (group) {
case HTML:
@ -2792,6 +2802,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to AFTER_FRAMESET
}
// CPPONLY: MOZ_FALLTHROUGH;
case AFTER_FRAMESET:
switch (group) {
case HTML:
@ -3371,6 +3382,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
errStrayEndTag(name);
break endtagloop;
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_ROW:
switch (group) {
case TR:
@ -3421,6 +3433,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_TABLE
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_TABLE_BODY:
switch (group) {
case TBODY_OR_THEAD_OR_TFOOT:
@ -3456,6 +3469,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_TABLE
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_TABLE:
switch (group) {
case TABLE:
@ -3487,6 +3501,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
errStrayEndTag(name);
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_CAPTION:
switch (group) {
case CAPTION:
@ -3532,6 +3547,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_CELL:
switch (group) {
case TD_OR_TH:
@ -3570,6 +3586,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_BODY
}
// CPPONLY: MOZ_FALLTHROUGH;
case FRAMESET_OK:
case IN_BODY:
switch (group) {
@ -3807,9 +3824,8 @@ public abstract class TreeBuilder<T> implements TokenHandler,
if (scriptingEnabled) {
errStrayEndTag(name);
break endtagloop;
} else {
// fall through
}
// CPPONLY: MOZ_FALLTHROUGH;
case A:
case B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U:
case FONT:
@ -3818,6 +3834,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
break endtagloop;
}
// else handle like any other tag
// CPPONLY: MOZ_FALLTHROUGH;
default:
if (isCurrent(name)) {
pop();
@ -3844,6 +3861,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
eltPos--;
}
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_HEAD:
switch (group) {
case HEAD:
@ -3932,6 +3950,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
default:
// fall through to IN_SELECT
}
// CPPONLY: MOZ_FALLTHROUGH;
case IN_SELECT:
switch (group) {
case OPTION:

View File

@ -99,5 +99,4 @@ LOCAL_INCLUDES += [
]
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
CXXFLAGS += ['-Wno-error=shadow',
'-Wno-implicit-fallthrough']
CXXFLAGS += ['-Wno-error=shadow']

View File

@ -133,6 +133,7 @@ stateloop:
}
}
dataloop_end:;
MOZ_FALLTHROUGH;
}
case TAG_OPEN: {
for (;;) {
@ -173,6 +174,7 @@ stateloop:
}
}
tagopenloop_end:;
MOZ_FALLTHROUGH;
}
case TAG_NAME: {
for (;;) {
@ -230,6 +232,7 @@ stateloop:
}
}
tagnameloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_ATTRIBUTE_NAME: {
for (;;) {
@ -288,6 +291,7 @@ stateloop:
}
}
beforeattributenameloop_end:;
MOZ_FALLTHROUGH;
}
case ATTRIBUTE_NAME: {
for (;;) {
@ -349,6 +353,7 @@ stateloop:
}
}
attributenameloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_ATTRIBUTE_VALUE: {
for (;;) {
@ -386,6 +391,7 @@ stateloop:
}
}
beforeattributevalueloop_end:;
MOZ_FALLTHROUGH;
}
case ATTRIBUTE_VALUE_DOUBLE_QUOTED: {
for (;;) {
@ -410,6 +416,7 @@ stateloop:
}
}
attributevaluedoublequotedloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_ATTRIBUTE_VALUE_QUOTED: {
for (;;) {
@ -444,6 +451,7 @@ stateloop:
}
}
afterattributevaluequotedloop_end:;
MOZ_FALLTHROUGH;
}
case SELF_CLOSING_START_TAG: {
c = read();
@ -566,6 +574,7 @@ stateloop:
}
}
markupdeclarationopenloop_end:;
MOZ_FALLTHROUGH;
}
case MARKUP_DECLARATION_HYPHEN: {
for (;;) {
@ -586,6 +595,7 @@ stateloop:
}
}
markupdeclarationhyphenloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_START: {
for (;;) {
@ -609,6 +619,7 @@ stateloop:
}
}
commentstartloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT: {
for (;;) {
@ -627,6 +638,7 @@ stateloop:
}
}
commentloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_END_DASH: {
for (;;) {
@ -646,6 +658,7 @@ stateloop:
}
}
commentenddashloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_END: {
for (;;) {

View File

@ -556,6 +556,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -563,6 +564,7 @@ stateloop:
}
}
dataloop_end:;
MOZ_FALLTHROUGH;
}
case TAG_OPEN: {
for (;;) {
@ -641,6 +643,7 @@ stateloop:
}
}
tagopenloop_end:;
MOZ_FALLTHROUGH;
}
case TAG_NAME: {
for (;;) {
@ -660,6 +663,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -690,6 +694,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -703,6 +708,7 @@ stateloop:
}
}
tagnameloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_ATTRIBUTE_NAME: {
for (;;) {
@ -721,6 +727,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -744,6 +751,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
case '\"':
case '\'':
@ -752,6 +760,7 @@ stateloop:
if (P::reportErrors) {
errBadCharBeforeAttributeNameOrNull(c);
}
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -767,6 +776,7 @@ stateloop:
}
}
beforeattributenameloop_end:;
MOZ_FALLTHROUGH;
}
case ATTRIBUTE_NAME: {
for (;;) {
@ -786,6 +796,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -826,6 +837,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
case '\"':
case '\'':
@ -833,6 +845,7 @@ stateloop:
if (P::reportErrors) {
errQuoteOrLtInAttributeNameOrNull(c);
}
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -844,6 +857,7 @@ stateloop:
}
}
attributenameloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_ATTRIBUTE_VALUE: {
for (;;) {
@ -858,6 +872,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -909,6 +924,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
case '<':
case '=':
@ -916,6 +932,7 @@ stateloop:
if (P::reportErrors) {
errLtOrEqualsOrGraveInUnquotedAttributeOrNull(c);
}
MOZ_FALLTHROUGH;
}
default: {
attributeLine = line;
@ -931,6 +948,7 @@ stateloop:
}
}
beforeattributevalueloop_end:;
MOZ_FALLTHROUGH;
}
case ATTRIBUTE_VALUE_DOUBLE_QUOTED: {
for (;;) {
@ -975,6 +993,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -983,6 +1002,7 @@ stateloop:
}
}
attributevaluedoublequotedloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_ATTRIBUTE_VALUE_QUOTED: {
for (;;) {
@ -1001,6 +1021,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -1040,6 +1061,7 @@ stateloop:
}
}
afterattributevaluequotedloop_end:;
MOZ_FALLTHROUGH;
}
case SELF_CLOSING_START_TAG: {
if (++pos == endPos) {
@ -1090,6 +1112,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -1125,6 +1148,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
case '<':
case '\"':
@ -1134,6 +1158,7 @@ stateloop:
if (P::reportErrors) {
errUnquotedAttributeValOrNull(c);
}
MOZ_FALLTHROUGH;
}
default: {
@ -1156,6 +1181,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -1188,6 +1214,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
case '\"':
case '\'':
@ -1195,6 +1222,7 @@ stateloop:
if (P::reportErrors) {
errQuoteOrLtInAttributeNameOrNull(c);
}
MOZ_FALLTHROUGH;
}
default: {
addAttributeWithoutValue();
@ -1246,6 +1274,7 @@ stateloop:
mViewSource, nsHtml5Tokenizer::CDATA_START, reconsume, pos);
NS_HTML5_CONTINUE(stateloop);
}
MOZ_FALLTHROUGH;
}
default: {
if (P::reportErrors) {
@ -1260,6 +1289,7 @@ stateloop:
}
}
markupdeclarationopenloop_end:;
MOZ_FALLTHROUGH;
}
case MARKUP_DECLARATION_HYPHEN: {
for (;;) {
@ -1289,6 +1319,7 @@ stateloop:
}
}
markupdeclarationhyphenloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_START: {
for (;;) {
@ -1328,6 +1359,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1338,6 +1370,7 @@ stateloop:
}
}
commentstartloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT: {
for (;;) {
@ -1364,6 +1397,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1372,6 +1406,7 @@ stateloop:
}
}
commentloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_END_DASH: {
for (;;) {
@ -1400,6 +1435,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1410,6 +1446,7 @@ stateloop:
}
}
commentenddashloop_end:;
MOZ_FALLTHROUGH;
}
case COMMENT_END: {
for (;;) {
@ -1453,6 +1490,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
adjustDoubleHyphenAndAppendToStrBufAndErr(c);
@ -1494,6 +1532,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1539,6 +1578,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1577,6 +1617,7 @@ stateloop:
break;
}
}
MOZ_FALLTHROUGH;
}
case CDATA_SECTION: {
for (;;) {
@ -1605,6 +1646,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -1612,6 +1654,7 @@ stateloop:
}
}
cdatasectionloop_end:;
MOZ_FALLTHROUGH;
}
case CDATA_RSQB: {
for (;;) {
@ -1636,6 +1679,7 @@ stateloop:
}
}
cdatarsqb_end:;
MOZ_FALLTHROUGH;
}
case CDATA_RSQB_RSQB: {
for (;;) {
@ -1708,6 +1752,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -1716,6 +1761,7 @@ stateloop:
}
}
attributevaluesinglequotedloop_end:;
MOZ_FALLTHROUGH;
}
case CONSUME_CHARACTER_REFERENCE: {
if (++pos == endPos) {
@ -1778,6 +1824,7 @@ stateloop:
pos);
}
}
MOZ_FALLTHROUGH;
}
case CHARACTER_REFERENCE_HILO_LOOKUP: {
{
@ -1818,6 +1865,7 @@ stateloop:
reconsume,
pos);
}
MOZ_FALLTHROUGH;
}
case CHARACTER_REFERENCE_TAIL: {
for (;;) {
@ -1967,6 +2015,7 @@ stateloop:
mViewSource, nsHtml5Tokenizer::DECIMAL_NRC_LOOP, reconsume, pos);
}
}
MOZ_FALLTHROUGH;
}
case DECIMAL_NRC_LOOP: {
for (;;) {
@ -2037,6 +2086,7 @@ stateloop:
}
}
decimalloop_end:;
MOZ_FALLTHROUGH;
}
case HANDLE_NCR_VALUE: {
charRefBufLen = 0;
@ -2144,6 +2194,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2190,6 +2241,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -2261,6 +2313,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2299,6 +2352,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2306,6 +2360,7 @@ stateloop:
}
}
rawtextloop_end:;
MOZ_FALLTHROUGH;
}
case RAWTEXT_RCDATA_LESS_THAN_SIGN: {
for (;;) {
@ -2333,6 +2388,7 @@ stateloop:
}
}
rawtextrcdatalessthansignloop_end:;
MOZ_FALLTHROUGH;
}
case NON_DATA_END_TAG_NAME: {
for (;;) {
@ -2372,6 +2428,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -2450,6 +2507,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -2458,6 +2516,7 @@ stateloop:
}
}
boguscommentloop_end:;
MOZ_FALLTHROUGH;
}
case BOGUS_COMMENT_HYPHEN: {
boguscommenthyphenloop:
@ -2491,6 +2550,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -2532,6 +2592,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2539,6 +2600,7 @@ stateloop:
}
}
scriptdataloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_LESS_THAN_SIGN: {
for (;;) {
@ -2576,6 +2638,7 @@ stateloop:
}
}
scriptdatalessthansignloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPE_START: {
for (;;) {
@ -2601,6 +2664,7 @@ stateloop:
}
}
scriptdataescapestartloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPE_START_DASH: {
for (;;) {
@ -2626,6 +2690,7 @@ stateloop:
}
}
scriptdataescapestartdashloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPED_DASH_DASH: {
for (;;) {
@ -2669,6 +2734,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
state = P::transition(mViewSource,
@ -2680,6 +2746,7 @@ stateloop:
}
}
scriptdataescapeddashdashloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPED: {
for (;;) {
@ -2718,6 +2785,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2725,6 +2793,7 @@ stateloop:
}
}
scriptdataescapedloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPED_DASH: {
for (;;) {
@ -2768,6 +2837,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
state = P::transition(mViewSource,
@ -2779,6 +2849,7 @@ stateloop:
}
}
scriptdataescapeddashloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN: {
for (;;) {
@ -2822,6 +2893,7 @@ stateloop:
}
}
scriptdataescapedlessthanloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPE_START: {
for (;;) {
@ -2858,6 +2930,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -2882,6 +2955,7 @@ stateloop:
}
}
scriptdatadoubleescapestartloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPED: {
for (;;) {
@ -2920,6 +2994,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -2927,6 +3002,7 @@ stateloop:
}
}
scriptdatadoubleescapedloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPED_DASH: {
for (;;) {
@ -2971,6 +3047,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
state =
@ -2983,6 +3060,7 @@ stateloop:
}
}
scriptdatadoubleescapeddashloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH: {
for (;;) {
@ -3027,6 +3105,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
state =
@ -3039,6 +3118,7 @@ stateloop:
}
}
scriptdatadoubleescapeddashdashloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN: {
for (;;) {
@ -3068,6 +3148,7 @@ stateloop:
}
}
scriptdatadoubleescapedlessthanloop_end:;
MOZ_FALLTHROUGH;
}
case SCRIPT_DATA_DOUBLE_ESCAPE_END: {
for (;;) {
@ -3103,6 +3184,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3159,6 +3241,7 @@ stateloop:
}
}
markupdeclarationdoctypeloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE: {
for (;;) {
@ -3182,6 +3265,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3206,6 +3290,7 @@ stateloop:
}
}
doctypeloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_DOCTYPE_NAME: {
for (;;) {
@ -3224,6 +3309,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3242,6 +3328,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -3256,6 +3343,7 @@ stateloop:
}
}
beforedoctypenameloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE_NAME: {
for (;;) {
@ -3275,6 +3363,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3295,6 +3384,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
if (c >= 'A' && c <= 'Z') {
@ -3306,6 +3396,7 @@ stateloop:
}
}
doctypenameloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_DOCTYPE_NAME: {
for (;;) {
@ -3320,6 +3411,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3355,6 +3447,7 @@ stateloop:
}
}
afterdoctypenameloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE_UBLIC: {
for (;;) {
@ -3387,6 +3480,7 @@ stateloop:
}
}
doctypeublicloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_DOCTYPE_PUBLIC_KEYWORD: {
for (;;) {
@ -3410,6 +3504,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3464,6 +3559,7 @@ stateloop:
}
}
afterdoctypepublickeywordloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_DOCTYPE_PUBLIC_IDENTIFIER: {
for (;;) {
@ -3478,6 +3574,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3521,6 +3618,7 @@ stateloop:
}
}
beforedoctypepublicidentifierloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED: {
for (;;) {
@ -3559,6 +3657,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -3567,6 +3666,7 @@ stateloop:
}
}
doctypepublicidentifierdoublequotedloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_DOCTYPE_PUBLIC_IDENTIFIER: {
for (;;) {
@ -3586,6 +3686,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3636,6 +3737,7 @@ stateloop:
}
}
afterdoctypepublicidentifierloop_end:;
MOZ_FALLTHROUGH;
}
case BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS: {
for (;;) {
@ -3650,6 +3752,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3689,6 +3792,7 @@ stateloop:
}
}
betweendoctypepublicandsystemidentifiersloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED: {
for (;;) {
@ -3727,6 +3831,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -3748,6 +3853,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3769,6 +3875,7 @@ stateloop:
}
}
afterdoctypesystemidentifierloop_end:;
MOZ_FALLTHROUGH;
}
case BOGUS_DOCTYPE: {
for (;;) {
@ -3793,6 +3900,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
default: {
continue;
@ -3831,6 +3939,7 @@ stateloop:
}
}
doctypeystemloop_end:;
MOZ_FALLTHROUGH;
}
case AFTER_DOCTYPE_SYSTEM_KEYWORD: {
for (;;) {
@ -3854,6 +3963,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3908,6 +4018,7 @@ stateloop:
}
}
afterdoctypesystemkeywordloop_end:;
MOZ_FALLTHROUGH;
}
case BEFORE_DOCTYPE_SYSTEM_IDENTIFIER: {
for (;;) {
@ -3922,6 +4033,7 @@ stateloop:
}
case '\n': {
silentLineFeed();
MOZ_FALLTHROUGH;
}
case ' ':
case '\t':
@ -3965,6 +4077,7 @@ stateloop:
}
}
beforedoctypesystemidentifierloop_end:;
MOZ_FALLTHROUGH;
}
case DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED: {
for (;;) {
@ -4003,6 +4116,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -4048,6 +4162,7 @@ stateloop:
}
case '\0': {
c = 0xfffd;
MOZ_FALLTHROUGH;
}
default: {
appendStrBuf(c);
@ -4077,6 +4192,7 @@ stateloop:
}
}
processinginstructionloop_end:;
MOZ_FALLTHROUGH;
}
case PROCESSING_INSTRUCTION_QUESTION_MARK: {
if (++pos == endPos) {

View File

@ -325,6 +325,7 @@ nsHtml5TreeBuilder::characters(const char16_t* buf,
if (!isInForeignButNotHtmlOrMathTextIntegrationPoint()) {
reconstructTheActiveFormattingElements();
}
MOZ_FALLTHROUGH;
}
case TEXT: {
accumulateCharacters(buf, start, length);
@ -625,6 +626,7 @@ nsHtml5TreeBuilder::eof()
if (isTemplateModeStackEmpty()) {
NS_HTML5_BREAK(eofloop);
}
MOZ_FALLTHROUGH;
}
case IN_TEMPLATE: {
int32_t eltPos = findLast(nsGkAtoms::_template);
@ -760,6 +762,7 @@ starttagloop:
NS_HTML5_CONTINUE(starttagloop);
}
}
MOZ_FALLTHROUGH;
}
default: {
if (kNameSpaceID_SVG == currNs) {
@ -890,6 +893,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_TABLE_BODY: {
switch (group) {
@ -929,6 +933,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_TABLE: {
for (;;) {
@ -1041,6 +1046,7 @@ starttagloop:
}
}
intableloop_end:;
MOZ_FALLTHROUGH;
}
case IN_CAPTION: {
switch (group) {
@ -1068,6 +1074,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_CELL: {
switch (group) {
@ -1088,6 +1095,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case FRAMESET_OK: {
switch (group) {
@ -1140,9 +1148,11 @@ starttagloop:
framesetOk = false;
mode = IN_BODY;
}
MOZ_FALLTHROUGH;
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_BODY: {
for (;;) {
@ -1363,6 +1373,7 @@ starttagloop:
case EMBED:
case AREA_OR_WBR: {
reconstructTheActiveFormattingElements();
MOZ_FALLTHROUGH;
}
#ifdef ENABLE_VOID_MENUITEM
case MENUITEM:
@ -1425,8 +1436,8 @@ starttagloop:
attributes);
attributes = nullptr;
NS_HTML5_BREAK(starttagloop);
} else {
}
MOZ_FALLTHROUGH;
}
case NOFRAMES:
case IFRAME:
@ -1560,6 +1571,7 @@ starttagloop:
}
}
inbodyloop_end:;
MOZ_FALLTHROUGH;
}
case IN_HEAD: {
for (;;) {
@ -1630,6 +1642,7 @@ starttagloop:
}
}
inheadloop_end:;
MOZ_FALLTHROUGH;
}
case IN_HEAD_NOSCRIPT: {
switch (group) {
@ -1734,6 +1747,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_SELECT: {
switch (group) {
@ -1842,6 +1856,7 @@ starttagloop:
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case AFTER_FRAMESET: {
switch (group) {
@ -2416,6 +2431,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
NS_HTML5_BREAK(endtagloop);
}
}
MOZ_FALLTHROUGH;
}
case IN_ROW: {
switch (group) {
@ -2471,6 +2487,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_TABLE_BODY: {
switch (group) {
@ -2509,6 +2526,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_TABLE: {
switch (group) {
@ -2543,6 +2561,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
errStrayEndTag(name);
}
}
MOZ_FALLTHROUGH;
}
case IN_CAPTION: {
switch (group) {
@ -2591,6 +2610,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_CELL: {
switch (group) {
@ -2635,6 +2655,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case FRAMESET_OK:
case IN_BODY: {
@ -2884,8 +2905,8 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
if (scriptingEnabled) {
errStrayEndTag(name);
NS_HTML5_BREAK(endtagloop);
} else {
}
MOZ_FALLTHROUGH;
}
case A:
case B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U:
@ -2894,6 +2915,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
if (adoptionAgencyEndTag(name)) {
NS_HTML5_BREAK(endtagloop);
}
MOZ_FALLTHROUGH;
}
default: {
if (isCurrent(name)) {
@ -2920,6 +2942,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
}
}
MOZ_FALLTHROUGH;
}
case IN_HEAD: {
switch (group) {
@ -3024,6 +3047,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
default:; // fall through
}
MOZ_FALLTHROUGH;
}
case IN_SELECT: {
switch (group) {