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

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

Browse Source 
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.
This commit is contained in:
Chris Peterson
2017-12-01 01:05:26 -08:00
parent 6fb553ab2a
commit 8e5d7c26d6
7 changed files with 314 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
parser/html/nsHtml5Tokenizer.cpp
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) {