mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-05 05:30:29 +00:00
Bug 570309 - Remove the dead code for the "comment end space" state. rs=jonas, a=blocking2.0-betaN.
--HG-- extra : rebase_source : 179fc95e1ed00bc85ea6245ece49ec3944507d62
This commit is contained in:
Henri Sivonen
parent
9460288afa
commit
05b0e57696
@ -142,79 +142,77 @@ public class Tokenizer implements Locator {
|
||||
|
||||
public static final int COMMENT_END = 36;
|
||||
|
||||
public static final int COMMENT_END_SPACE = 37;
|
||||
public static final int COMMENT_END_BANG = 37;
|
||||
|
||||
public static final int COMMENT_END_BANG = 38;
|
||||
public static final int NON_DATA_END_TAG_NAME = 38;
|
||||
|
||||
public static final int NON_DATA_END_TAG_NAME = 39;
|
||||
public static final int MARKUP_DECLARATION_HYPHEN = 39;
|
||||
|
||||
public static final int MARKUP_DECLARATION_HYPHEN = 40;
|
||||
public static final int MARKUP_DECLARATION_OCTYPE = 40;
|
||||
|
||||
public static final int MARKUP_DECLARATION_OCTYPE = 41;
|
||||
public static final int DOCTYPE_UBLIC = 41;
|
||||
|
||||
public static final int DOCTYPE_UBLIC = 42;
|
||||
public static final int DOCTYPE_YSTEM = 42;
|
||||
|
||||
public static final int DOCTYPE_YSTEM = 43;
|
||||
public static final int AFTER_DOCTYPE_PUBLIC_KEYWORD = 43;
|
||||
|
||||
public static final int AFTER_DOCTYPE_PUBLIC_KEYWORD = 44;
|
||||
public static final int BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS = 44;
|
||||
|
||||
public static final int BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS = 45;
|
||||
public static final int AFTER_DOCTYPE_SYSTEM_KEYWORD = 45;
|
||||
|
||||
public static final int AFTER_DOCTYPE_SYSTEM_KEYWORD = 46;
|
||||
public static final int CONSUME_CHARACTER_REFERENCE = 46;
|
||||
|
||||
public static final int CONSUME_CHARACTER_REFERENCE = 47;
|
||||
public static final int CONSUME_NCR = 47;
|
||||
|
||||
public static final int CONSUME_NCR = 48;
|
||||
public static final int CHARACTER_REFERENCE_TAIL = 48;
|
||||
|
||||
public static final int CHARACTER_REFERENCE_TAIL = 49;
|
||||
public static final int HEX_NCR_LOOP = 49;
|
||||
|
||||
public static final int HEX_NCR_LOOP = 50;
|
||||
public static final int DECIMAL_NRC_LOOP = 50;
|
||||
|
||||
public static final int DECIMAL_NRC_LOOP = 51;
|
||||
public static final int HANDLE_NCR_VALUE = 51;
|
||||
|
||||
public static final int HANDLE_NCR_VALUE = 52;
|
||||
public static final int HANDLE_NCR_VALUE_RECONSUME = 52;
|
||||
|
||||
public static final int HANDLE_NCR_VALUE_RECONSUME = 53;
|
||||
public static final int CHARACTER_REFERENCE_HILO_LOOKUP = 53;
|
||||
|
||||
public static final int CHARACTER_REFERENCE_HILO_LOOKUP = 54;
|
||||
public static final int SELF_CLOSING_START_TAG = 54;
|
||||
|
||||
public static final int SELF_CLOSING_START_TAG = 55;
|
||||
public static final int CDATA_START = 55;
|
||||
|
||||
public static final int CDATA_START = 56;
|
||||
public static final int CDATA_SECTION = 56;
|
||||
|
||||
public static final int CDATA_SECTION = 57;
|
||||
public static final int CDATA_RSQB = 57;
|
||||
|
||||
public static final int CDATA_RSQB = 58;
|
||||
public static final int CDATA_RSQB_RSQB = 58;
|
||||
|
||||
public static final int CDATA_RSQB_RSQB = 59;
|
||||
public static final int SCRIPT_DATA_LESS_THAN_SIGN = 59;
|
||||
|
||||
public static final int SCRIPT_DATA_LESS_THAN_SIGN = 60;
|
||||
public static final int SCRIPT_DATA_ESCAPE_START = 60;
|
||||
|
||||
public static final int SCRIPT_DATA_ESCAPE_START = 61;
|
||||
public static final int SCRIPT_DATA_ESCAPE_START_DASH = 61;
|
||||
|
||||
public static final int SCRIPT_DATA_ESCAPE_START_DASH = 62;
|
||||
public static final int SCRIPT_DATA_ESCAPED_DASH = 62;
|
||||
|
||||
public static final int SCRIPT_DATA_ESCAPED_DASH = 63;
|
||||
public static final int SCRIPT_DATA_ESCAPED_DASH_DASH = 63;
|
||||
|
||||
public static final int SCRIPT_DATA_ESCAPED_DASH_DASH = 64;
|
||||
public static final int BOGUS_COMMENT_HYPHEN = 64;
|
||||
|
||||
public static final int BOGUS_COMMENT_HYPHEN = 65;
|
||||
public static final int RAWTEXT_RCDATA_LESS_THAN_SIGN = 65;
|
||||
|
||||
public static final int RAWTEXT_RCDATA_LESS_THAN_SIGN = 66;
|
||||
public static final int SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN = 66;
|
||||
|
||||
public static final int SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN = 67;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPE_START = 67;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPE_START = 68;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED = 68;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED = 69;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN = 69;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN = 70;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_DASH = 70;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_DASH = 71;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH = 71;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH = 72;
|
||||
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPE_END = 73;
|
||||
public static final int SCRIPT_DATA_DOUBLE_ESCAPE_END = 72;
|
||||
|
||||
/**
|
||||
* Magic value for UTF-16 operations.
|
||||
@ -2603,75 +2601,6 @@ public class Tokenizer implements Locator {
|
||||
continue stateloop;
|
||||
}
|
||||
}
|
||||
case COMMENT_END_SPACE:
|
||||
for (;;) {
|
||||
if (++pos == endPos) {
|
||||
break stateloop;
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
/*
|
||||
* Comment end space state
|
||||
*
|
||||
* Consume the next input character:
|
||||
*/
|
||||
switch (c) {
|
||||
case '>':
|
||||
/*
|
||||
* U+003E GREATER-THAN SIGN (>) Emit the comment
|
||||
* token.
|
||||
*/
|
||||
emitComment(0, pos);
|
||||
/*
|
||||
* Switch to the data state.
|
||||
*/
|
||||
state = transition(state, Tokenizer.DATA, reconsume, pos);
|
||||
continue stateloop;
|
||||
case '-':
|
||||
/*
|
||||
* U+002D HYPHEN-MINUS (-) Switch to the comment
|
||||
* end dash state.
|
||||
*/
|
||||
appendLongStrBuf(c);
|
||||
/*
|
||||
* Switch to the comment end dash state.
|
||||
*/
|
||||
state = transition(state, Tokenizer.COMMENT_END_DASH, reconsume, pos);
|
||||
continue stateloop;
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\u000C':
|
||||
/*
|
||||
* U+0009 CHARACTER TABULATION U+000A LINE FEED
|
||||
* (LF) U+000C FORM FEED (FF) U+0020 SPACE
|
||||
* Append the input character to the comment
|
||||
* token's data. Stay in the comment end space
|
||||
* state.
|
||||
*/
|
||||
appendLongStrBuf(c);
|
||||
continue;
|
||||
case '\r':
|
||||
appendLongStrBufCarriageReturn();
|
||||
break stateloop;
|
||||
case '\n':
|
||||
appendLongStrBufLineFeed();
|
||||
continue;
|
||||
case '\u0000':
|
||||
c = '\uFFFD';
|
||||
// fall thru
|
||||
default:
|
||||
/*
|
||||
* Anything else Append the input character to
|
||||
* the comment token's data. Switch to the
|
||||
* comment state.
|
||||
*/
|
||||
appendLongStrBuf(c);
|
||||
/*
|
||||
* Switch to the comment state.
|
||||
*/
|
||||
state = transition(state, Tokenizer.COMMENT, reconsume, pos);
|
||||
continue stateloop;
|
||||
}
|
||||
}
|
||||
// XXX reorder point
|
||||
case COMMENT_END_BANG:
|
||||
for (;;) {
|
||||
@ -6132,7 +6061,6 @@ public class Tokenizer implements Locator {
|
||||
break eofloop;
|
||||
case COMMENT_START:
|
||||
case COMMENT:
|
||||
case COMMENT_END_SPACE:
|
||||
/*
|
||||
* EOF Parse error.
|
||||
*/
|
||||
@ -6997,5 +6925,19 @@ public class Tokenizer implements Locator {
|
||||
EncodingDeclarationHandler encodingDeclarationHandler) {
|
||||
this.encodingDeclarationHandler = encodingDeclarationHandler;
|
||||
}
|
||||
|
||||
// [NOCPP[
|
||||
|
||||
/**
|
||||
* Sets an offset to be added to the position reported to
|
||||
* <code>TransitionHandler</code>.
|
||||
*
|
||||
* @param offset the offset
|
||||
*/
|
||||
public void setTransitionBaseOffset(int offset) {
|
||||
|
||||
}
|
||||
|
||||
// ]NOCPP]
|
||||
|
||||
}
|
||||
|
||||
@ -1141,48 +1141,6 @@ nsHtml5Tokenizer::stateLoop(PRInt32 state, PRUnichar c, PRInt32 pos, PRUnichar*
|
||||
}
|
||||
|
||||
}
|
||||
case NS_HTML5TOKENIZER_COMMENT_END_SPACE: {
|
||||
for (; ; ) {
|
||||
if (++pos == endPos) {
|
||||
NS_HTML5_BREAK(stateloop);
|
||||
}
|
||||
c = checkChar(buf, pos);
|
||||
switch(c) {
|
||||
case '>': {
|
||||
emitComment(0, pos);
|
||||
state = NS_HTML5TOKENIZER_DATA;
|
||||
NS_HTML5_CONTINUE(stateloop);
|
||||
}
|
||||
case '-': {
|
||||
appendLongStrBuf(c);
|
||||
state = NS_HTML5TOKENIZER_COMMENT_END_DASH;
|
||||
NS_HTML5_CONTINUE(stateloop);
|
||||
}
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\f': {
|
||||
appendLongStrBuf(c);
|
||||
continue;
|
||||
}
|
||||
case '\r': {
|
||||
appendLongStrBufCarriageReturn();
|
||||
NS_HTML5_BREAK(stateloop);
|
||||
}
|
||||
case '\n': {
|
||||
appendLongStrBufLineFeed();
|
||||
continue;
|
||||
}
|
||||
case '\0': {
|
||||
c = 0xfffd;
|
||||
}
|
||||
default: {
|
||||
appendLongStrBuf(c);
|
||||
state = NS_HTML5TOKENIZER_COMMENT;
|
||||
NS_HTML5_CONTINUE(stateloop);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case NS_HTML5TOKENIZER_COMMENT_END_BANG: {
|
||||
for (; ; ) {
|
||||
if (++pos == endPos) {
|
||||
@ -3493,8 +3451,7 @@ nsHtml5Tokenizer::eof()
|
||||
NS_HTML5_BREAK(eofloop);
|
||||
}
|
||||
case NS_HTML5TOKENIZER_COMMENT_START:
|
||||
case NS_HTML5TOKENIZER_COMMENT:
|
||||
case NS_HTML5TOKENIZER_COMMENT_END_SPACE: {
|
||||
case NS_HTML5TOKENIZER_COMMENT: {
|
||||
|
||||
emitComment(0, 0);
|
||||
NS_HTML5_BREAK(eofloop);
|
||||
|
||||
@ -352,43 +352,42 @@ jArray<PRUnichar,PRInt32> nsHtml5Tokenizer::NOFRAMES_ARR = 0;
|
||||
#define NS_HTML5TOKENIZER_COMMENT 34
|
||||
#define NS_HTML5TOKENIZER_COMMENT_END_DASH 35
|
||||
#define NS_HTML5TOKENIZER_COMMENT_END 36
|
||||
#define NS_HTML5TOKENIZER_COMMENT_END_SPACE 37
|
||||
#define NS_HTML5TOKENIZER_COMMENT_END_BANG 38
|
||||
#define NS_HTML5TOKENIZER_NON_DATA_END_TAG_NAME 39
|
||||
#define NS_HTML5TOKENIZER_MARKUP_DECLARATION_HYPHEN 40
|
||||
#define NS_HTML5TOKENIZER_MARKUP_DECLARATION_OCTYPE 41
|
||||
#define NS_HTML5TOKENIZER_DOCTYPE_UBLIC 42
|
||||
#define NS_HTML5TOKENIZER_DOCTYPE_YSTEM 43
|
||||
#define NS_HTML5TOKENIZER_AFTER_DOCTYPE_PUBLIC_KEYWORD 44
|
||||
#define NS_HTML5TOKENIZER_BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS 45
|
||||
#define NS_HTML5TOKENIZER_AFTER_DOCTYPE_SYSTEM_KEYWORD 46
|
||||
#define NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE 47
|
||||
#define NS_HTML5TOKENIZER_CONSUME_NCR 48
|
||||
#define NS_HTML5TOKENIZER_CHARACTER_REFERENCE_TAIL 49
|
||||
#define NS_HTML5TOKENIZER_HEX_NCR_LOOP 50
|
||||
#define NS_HTML5TOKENIZER_DECIMAL_NRC_LOOP 51
|
||||
#define NS_HTML5TOKENIZER_HANDLE_NCR_VALUE 52
|
||||
#define NS_HTML5TOKENIZER_HANDLE_NCR_VALUE_RECONSUME 53
|
||||
#define NS_HTML5TOKENIZER_CHARACTER_REFERENCE_HILO_LOOKUP 54
|
||||
#define NS_HTML5TOKENIZER_SELF_CLOSING_START_TAG 55
|
||||
#define NS_HTML5TOKENIZER_CDATA_START 56
|
||||
#define NS_HTML5TOKENIZER_CDATA_SECTION 57
|
||||
#define NS_HTML5TOKENIZER_CDATA_RSQB 58
|
||||
#define NS_HTML5TOKENIZER_CDATA_RSQB_RSQB 59
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_LESS_THAN_SIGN 60
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPE_START 61
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPE_START_DASH 62
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_DASH 63
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_DASH_DASH 64
|
||||
#define NS_HTML5TOKENIZER_BOGUS_COMMENT_HYPHEN 65
|
||||
#define NS_HTML5TOKENIZER_RAWTEXT_RCDATA_LESS_THAN_SIGN 66
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN 67
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPE_START 68
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED 69
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN 70
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_DASH 71
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH 72
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPE_END 73
|
||||
#define NS_HTML5TOKENIZER_COMMENT_END_BANG 37
|
||||
#define NS_HTML5TOKENIZER_NON_DATA_END_TAG_NAME 38
|
||||
#define NS_HTML5TOKENIZER_MARKUP_DECLARATION_HYPHEN 39
|
||||
#define NS_HTML5TOKENIZER_MARKUP_DECLARATION_OCTYPE 40
|
||||
#define NS_HTML5TOKENIZER_DOCTYPE_UBLIC 41
|
||||
#define NS_HTML5TOKENIZER_DOCTYPE_YSTEM 42
|
||||
#define NS_HTML5TOKENIZER_AFTER_DOCTYPE_PUBLIC_KEYWORD 43
|
||||
#define NS_HTML5TOKENIZER_BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS 44
|
||||
#define NS_HTML5TOKENIZER_AFTER_DOCTYPE_SYSTEM_KEYWORD 45
|
||||
#define NS_HTML5TOKENIZER_CONSUME_CHARACTER_REFERENCE 46
|
||||
#define NS_HTML5TOKENIZER_CONSUME_NCR 47
|
||||
#define NS_HTML5TOKENIZER_CHARACTER_REFERENCE_TAIL 48
|
||||
#define NS_HTML5TOKENIZER_HEX_NCR_LOOP 49
|
||||
#define NS_HTML5TOKENIZER_DECIMAL_NRC_LOOP 50
|
||||
#define NS_HTML5TOKENIZER_HANDLE_NCR_VALUE 51
|
||||
#define NS_HTML5TOKENIZER_HANDLE_NCR_VALUE_RECONSUME 52
|
||||
#define NS_HTML5TOKENIZER_CHARACTER_REFERENCE_HILO_LOOKUP 53
|
||||
#define NS_HTML5TOKENIZER_SELF_CLOSING_START_TAG 54
|
||||
#define NS_HTML5TOKENIZER_CDATA_START 55
|
||||
#define NS_HTML5TOKENIZER_CDATA_SECTION 56
|
||||
#define NS_HTML5TOKENIZER_CDATA_RSQB 57
|
||||
#define NS_HTML5TOKENIZER_CDATA_RSQB_RSQB 58
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_LESS_THAN_SIGN 59
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPE_START 60
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPE_START_DASH 61
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_DASH 62
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_DASH_DASH 63
|
||||
#define NS_HTML5TOKENIZER_BOGUS_COMMENT_HYPHEN 64
|
||||
#define NS_HTML5TOKENIZER_RAWTEXT_RCDATA_LESS_THAN_SIGN 65
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN 66
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPE_START 67
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED 68
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_LESS_THAN_SIGN 69
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_DASH 70
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPED_DASH_DASH 71
|
||||
#define NS_HTML5TOKENIZER_SCRIPT_DATA_DOUBLE_ESCAPE_END 72
|
||||
#define NS_HTML5TOKENIZER_LEAD_OFFSET (0xD800 - (0x10000 >> 10))
|
||||
#define NS_HTML5TOKENIZER_BUFFER_GROW_BY 1024
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user