parse5 2.1.5 → 2.2.3

package/lib/tokenizer/index.js

@@ -72,16 +72,12 @@ var DATA_STATE = 'DATA_STATE',
     COMMENT_END_STATE = 'COMMENT_END_STATE',
     COMMENT_END_BANG_STATE = 'COMMENT_END_BANG_STATE',
     DOCTYPE_STATE = 'DOCTYPE_STATE',
-    BEFORE_DOCTYPE_NAME_STATE = 'BEFORE_DOCTYPE_NAME_STATE',
     DOCTYPE_NAME_STATE = 'DOCTYPE_NAME_STATE',
     AFTER_DOCTYPE_NAME_STATE = 'AFTER_DOCTYPE_NAME_STATE',
-    AFTER_DOCTYPE_PUBLIC_KEYWORD_STATE = 'AFTER_DOCTYPE_PUBLIC_KEYWORD_STATE',
     BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE = 'BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE',
     DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED_STATE = 'DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED_STATE',
     DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE = 'DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE',
-    AFTER_DOCTYPE_PUBLIC_IDENTIFIER_STATE = 'AFTER_DOCTYPE_PUBLIC_IDENTIFIER_STATE',
     BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE = 'BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE',
-    AFTER_DOCTYPE_SYSTEM_KEYWORD_STATE = 'AFTER_DOCTYPE_SYSTEM_KEYWORD_STATE',
     BEFORE_DOCTYPE_SYSTEM_IDENTIFIER_STATE = 'BEFORE_DOCTYPE_SYSTEM_IDENTIFIER_STATE',
     DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED_STATE = 'DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED_STATE',
     DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE = 'DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE',
@@ -110,8 +106,12 @@ function isAsciiLower(cp) {
     return cp >= $.LATIN_SMALL_A && cp <= $.LATIN_SMALL_Z;
 }
 
+function isAsciiLetter(cp) {
+    return isAsciiLower(cp) || isAsciiUpper(cp);
+}
+
 function isAsciiAlphaNumeric(cp) {
-    return isAsciiDigit(cp) || isAsciiUpper(cp) || isAsciiLower(cp);
+    return isAsciiLetter(cp) || isAsciiDigit(cp);
 }
 
 function isDigit(cp, isHex) {
@@ -319,32 +319,23 @@ Tokenizer.prototype.isTempBufferEqualToScriptString = function () {
 };
 
 //Token creation
-Tokenizer.prototype.buildStartTagToken = function (tagName) {
-    return {
+Tokenizer.prototype._createStartTagToken = function () {
+    this.currentToken = {
         type: Tokenizer.START_TAG_TOKEN,
-        tagName: tagName,
+        tagName: '',
         selfClosing: false,
         attrs: []
     };
 };
 
-Tokenizer.prototype.buildEndTagToken = function (tagName) {
-    return {
+Tokenizer.prototype._createEndTagToken = function () {
+    this.currentToken = {
         type: Tokenizer.END_TAG_TOKEN,
-        tagName: tagName,
-        ignored: false,
+        tagName: '',
         attrs: []
     };
 };
 
-Tokenizer.prototype._createStartTagToken = function (tagNameFirstCh) {
-    this.currentToken = this.buildStartTagToken(tagNameFirstCh);
-};
-
-Tokenizer.prototype._createEndTagToken = function (tagNameFirstCh) {
-    this.currentToken = this.buildEndTagToken(tagNameFirstCh);
-};
-
 Tokenizer.prototype._createCommentToken = function () {
     this.currentToken = {
         type: Tokenizer.COMMENT_TOKEN,
@@ -352,10 +343,10 @@ Tokenizer.prototype._createCommentToken = function () {
     };
 };
 
-Tokenizer.prototype._createDoctypeToken = function (doctypeNameFirstCh) {
+Tokenizer.prototype._createDoctypeToken = function (initialName) {
     this.currentToken = {
         type: Tokenizer.DOCTYPE_TOKEN,
-        name: doctypeNameFirstCh || null,
+        name: initialName,
         forceQuirks: false,
         publicId: null,
         systemId: null
@@ -583,6 +574,8 @@ var _ = Tokenizer.prototype;
 //12.2.4.1 Data state
 //------------------------------------------------------------------
 _[DATA_STATE] = function dataState(cp) {
+    this.preprocessor.dropParsedChunk();
+
     if (cp === $.AMPERSAND)
         this.state = CHARACTER_REFERENCE_IN_DATA_STATE;
 
@@ -622,6 +615,8 @@ _[CHARACTER_REFERENCE_IN_DATA_STATE] = function characterReferenceInDataState(cp
 //12.2.4.3 RCDATA state
 //------------------------------------------------------------------
 _[RCDATA_STATE] = function rcdataState(cp) {
+    this.preprocessor.dropParsedChunk();
+
     if (cp === $.AMPERSAND)
         this.state = CHARACTER_REFERENCE_IN_RCDATA_STATE;
 
@@ -661,6 +656,8 @@ _[CHARACTER_REFERENCE_IN_RCDATA_STATE] = function characterReferenceInRcdataStat
 //12.2.4.5 RAWTEXT state
 //------------------------------------------------------------------
 _[RAWTEXT_STATE] = function rawtextState(cp) {
+    this.preprocessor.dropParsedChunk();
+
     if (cp === $.LESS_THAN_SIGN)
         this.state = RAWTEXT_LESS_THAN_SIGN_STATE;
 
@@ -678,6 +675,8 @@ _[RAWTEXT_STATE] = function rawtextState(cp) {
 //12.2.4.6 Script data state
 //------------------------------------------------------------------
 _[SCRIPT_DATA_STATE] = function scriptDataState(cp) {
+    this.preprocessor.dropParsedChunk();
+
     if (cp === $.LESS_THAN_SIGN)
         this.state = SCRIPT_DATA_LESS_THAN_SIGN_STATE;
 
@@ -695,6 +694,8 @@ _[SCRIPT_DATA_STATE] = function scriptDataState(cp) {
 //12.2.4.7 PLAINTEXT state
 //------------------------------------------------------------------
 _[PLAINTEXT_STATE] = function plaintextState(cp) {
+    this.preprocessor.dropParsedChunk();
+
     if (cp === $.NULL)
         this._emitChar(UNICODE.REPLACEMENT_CHARACTER);
 
@@ -715,14 +716,9 @@ _[TAG_OPEN_STATE] = function tagOpenState(cp) {
     else if (cp === $.SOLIDUS)
         this.state = END_TAG_OPEN_STATE;
 
-    else if (isAsciiUpper(cp)) {
-        this._createStartTagToken(toAsciiLowerChar(cp));
-        this.state = TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createStartTagToken(toChar(cp));
-        this.state = TAG_NAME_STATE;
+    else if (isAsciiLetter(cp)) {
+        this._createStartTagToken();
+        this._reconsumeInState(TAG_NAME_STATE);
     }
 
     else if (cp === $.QUESTION_MARK)
@@ -738,14 +734,9 @@ _[TAG_OPEN_STATE] = function tagOpenState(cp) {
 //12.2.4.9 End tag open state
 //------------------------------------------------------------------
 _[END_TAG_OPEN_STATE] = function endTagOpenState(cp) {
-    if (isAsciiUpper(cp)) {
-        this._createEndTagToken(toAsciiLowerChar(cp));
-        this.state = TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createEndTagToken(toChar(cp));
-        this.state = TAG_NAME_STATE;
+    if (isAsciiLetter(cp)) {
+        this._createEndTagToken();
+        this._reconsumeInState(TAG_NAME_STATE);
     }
 
     else if (cp === $.GREATER_THAN_SIGN)
@@ -808,16 +799,9 @@ _[RCDATA_LESS_THAN_SIGN_STATE] = function rcdataLessThanSignState(cp) {
 //12.2.4.12 RCDATA end tag open state
 //------------------------------------------------------------------
 _[RCDATA_END_TAG_OPEN_STATE] = function rcdataEndTagOpenState(cp) {
-    if (isAsciiUpper(cp)) {
-        this._createEndTagToken(toAsciiLowerChar(cp));
-        this.tempBuff.push(cp);
-        this.state = RCDATA_END_TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createEndTagToken(toChar(cp));
-        this.tempBuff.push(cp);
-        this.state = RCDATA_END_TAG_NAME_STATE;
+    if (isAsciiLetter(cp)) {
+        this._createEndTagToken();
+        this._reconsumeInState(RCDATA_END_TAG_NAME_STATE);
     }
 
     else {
@@ -886,16 +870,9 @@ _[RAWTEXT_LESS_THAN_SIGN_STATE] = function rawtextLessThanSignState(cp) {
 //12.2.4.15 RAWTEXT end tag open state
 //------------------------------------------------------------------
 _[RAWTEXT_END_TAG_OPEN_STATE] = function rawtextEndTagOpenState(cp) {
-    if (isAsciiUpper(cp)) {
-        this._createEndTagToken(toAsciiLowerChar(cp));
-        this.tempBuff.push(cp);
-        this.state = RAWTEXT_END_TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createEndTagToken(toChar(cp));
-        this.tempBuff.push(cp);
-        this.state = RAWTEXT_END_TAG_NAME_STATE;
+    if (isAsciiLetter(cp)) {
+        this._createEndTagToken();
+        this._reconsumeInState(RAWTEXT_END_TAG_NAME_STATE);
     }
 
     else {
@@ -970,16 +947,9 @@ _[SCRIPT_DATA_LESS_THAN_SIGN_STATE] = function scriptDataLessThanSignState(cp) {
 //12.2.4.18 Script data end tag open state
 //------------------------------------------------------------------
 _[SCRIPT_DATA_END_TAG_OPEN_STATE] = function scriptDataEndTagOpenState(cp) {
-    if (isAsciiUpper(cp)) {
-        this._createEndTagToken(toAsciiLowerChar(cp));
-        this.tempBuff.push(cp);
-        this.state = SCRIPT_DATA_END_TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createEndTagToken(toChar(cp));
-        this.tempBuff.push(cp);
-        this.state = SCRIPT_DATA_END_TAG_NAME_STATE;
+    if (isAsciiLetter(cp)) {
+        this._createEndTagToken();
+        this._reconsumeInState(SCRIPT_DATA_END_TAG_NAME_STATE);
     }
 
     else {
@@ -1141,20 +1111,10 @@ _[SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN_STATE] = function scriptDataEscapedLessThan
         this.state = SCRIPT_DATA_ESCAPED_END_TAG_OPEN_STATE;
     }
 
-    else if (isAsciiUpper(cp)) {
-        this.tempBuff = [];
-        this.tempBuff.push(toAsciiLowerCodePoint(cp));
-        this.state = SCRIPT_DATA_DOUBLE_ESCAPE_START_STATE;
-        this._emitChar('<');
-        this._emitCodePoint(cp);
-    }
-
-    else if (isAsciiLower(cp)) {
+    else if (isAsciiLetter(cp)) {
         this.tempBuff = [];
-        this.tempBuff.push(cp);
-        this.state = SCRIPT_DATA_DOUBLE_ESCAPE_START_STATE;
         this._emitChar('<');
-        this._emitCodePoint(cp);
+        this._reconsumeInState(SCRIPT_DATA_DOUBLE_ESCAPE_START_STATE);
     }
 
     else {
@@ -1167,16 +1127,9 @@ _[SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN_STATE] = function scriptDataEscapedLessThan
 //12.2.4.26 Script data escaped end tag open state
 //------------------------------------------------------------------
 _[SCRIPT_DATA_ESCAPED_END_TAG_OPEN_STATE] = function scriptDataEscapedEndTagOpenState(cp) {
-    if (isAsciiUpper(cp)) {
-        this._createEndTagToken(toAsciiLowerChar(cp));
-        this.tempBuff.push(cp);
-        this.state = SCRIPT_DATA_ESCAPED_END_TAG_NAME_STATE;
-    }
-
-    else if (isAsciiLower(cp)) {
-        this._createEndTagToken(toChar(cp));
-        this.tempBuff.push(cp);
-        this.state = SCRIPT_DATA_ESCAPED_END_TAG_NAME_STATE;
+    if (isAsciiLetter(cp)) {
+        this._createEndTagToken();
+        this._reconsumeInState(SCRIPT_DATA_ESCAPED_END_TAG_NAME_STATE);
     }
 
     else {
@@ -1377,35 +1330,17 @@ _[BEFORE_ATTRIBUTE_NAME_STATE] = function beforeAttributeNameState(cp) {
     if (isWhitespace(cp))
         return;
 
-    if (cp === $.SOLIDUS)
-        this.state = SELF_CLOSING_START_TAG_STATE;
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.state = DATA_STATE;
-        this._emitCurrentToken();
-    }
-
-    else if (isAsciiUpper(cp)) {
-        this._createAttr(toAsciiLowerChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
-    }
+    if (cp === $.SOLIDUS || cp === $.GREATER_THAN_SIGN || cp === $.EOF)
+        this._reconsumeInState(AFTER_ATTRIBUTE_NAME_STATE);
 
-    else if (cp === $.NULL) {
-        this._createAttr(UNICODE.REPLACEMENT_CHARACTER);
+    else if (cp === $.EQUALS_SIGN) {
+        this._createAttr('=');
         this.state = ATTRIBUTE_NAME_STATE;
     }
 
-    else if (cp === $.QUOTATION_MARK || cp === $.APOSTROPHE || cp === $.LESS_THAN_SIGN || cp === $.EQUALS_SIGN) {
-        this._createAttr(toChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
-    }
-
-    else if (cp === $.EOF)
-        this._reconsumeInState(DATA_STATE);
-
     else {
-        this._createAttr(toChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
+        this._createAttr('');
+        this._reconsumeInState(ATTRIBUTE_NAME_STATE);
     }
 };
 
@@ -1413,20 +1348,14 @@ _[BEFORE_ATTRIBUTE_NAME_STATE] = function beforeAttributeNameState(cp) {
 //12.2.4.35 Attribute name state
 //------------------------------------------------------------------
 _[ATTRIBUTE_NAME_STATE] = function attributeNameState(cp) {
-    if (isWhitespace(cp))
+    if (isWhitespace(cp) || cp === $.SOLIDUS || cp === $.GREATER_THAN_SIGN || cp === $.EOF) {
         this._leaveAttrName(AFTER_ATTRIBUTE_NAME_STATE);
-
-    else if (cp === $.SOLIDUS)
-        this._leaveAttrName(SELF_CLOSING_START_TAG_STATE);
+        this._unconsume();
+    }
 
     else if (cp === $.EQUALS_SIGN)
         this._leaveAttrName(BEFORE_ATTRIBUTE_VALUE_STATE);
 
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this._leaveAttrName(DATA_STATE);
-        this._emitCurrentToken();
-    }
-
     else if (isAsciiUpper(cp))
         this.currentAttr.name += toAsciiLowerChar(cp);
 
@@ -1436,9 +1365,6 @@ _[ATTRIBUTE_NAME_STATE] = function attributeNameState(cp) {
     else if (cp === $.NULL)
         this.currentAttr.name += UNICODE.REPLACEMENT_CHARACTER;
 
-    else if (cp === $.EOF)
-        this._reconsumeInState(DATA_STATE);
-
     else
         this.currentAttr.name += toChar(cp);
 };
@@ -1461,27 +1387,12 @@ _[AFTER_ATTRIBUTE_NAME_STATE] = function afterAttributeNameState(cp) {
         this._emitCurrentToken();
     }
 
-    else if (isAsciiUpper(cp)) {
-        this._createAttr(toAsciiLowerChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
-    }
-
-    else if (cp === $.NULL) {
-        this._createAttr(UNICODE.REPLACEMENT_CHARACTER);
-        this.state = ATTRIBUTE_NAME_STATE;
-    }
-
-    else if (cp === $.QUOTATION_MARK || cp === $.APOSTROPHE || cp === $.LESS_THAN_SIGN) {
-        this._createAttr(toChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
-    }
-
     else if (cp === $.EOF)
         this._reconsumeInState(DATA_STATE);
 
     else {
-        this._createAttr(toChar(cp));
-        this.state = ATTRIBUTE_NAME_STATE;
+        this._createAttr('');
+        this._reconsumeInState(ATTRIBUTE_NAME_STATE);
     }
 };
 
@@ -1495,34 +1406,11 @@ _[BEFORE_ATTRIBUTE_VALUE_STATE] = function beforeAttributeValueState(cp) {
     if (cp === $.QUOTATION_MARK)
         this.state = ATTRIBUTE_VALUE_DOUBLE_QUOTED_STATE;
 
-    else if (cp === $.AMPERSAND)
-        this._reconsumeInState(ATTRIBUTE_VALUE_UNQUOTED_STATE);
-
     else if (cp === $.APOSTROPHE)
         this.state = ATTRIBUTE_VALUE_SINGLE_QUOTED_STATE;
 
-    else if (cp === $.NULL) {
-        this.currentAttr.value += UNICODE.REPLACEMENT_CHARACTER;
-        this.state = ATTRIBUTE_VALUE_UNQUOTED_STATE;
-    }
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.state = DATA_STATE;
-        this._emitCurrentToken();
-    }
-
-    else if (cp === $.LESS_THAN_SIGN || cp === $.EQUALS_SIGN || cp === $.GRAVE_ACCENT) {
-        this.currentAttr.value += toChar(cp);
-        this.state = ATTRIBUTE_VALUE_UNQUOTED_STATE;
-    }
-
-    else if (cp === $.EOF)
-        this._reconsumeInState(DATA_STATE);
-
-    else {
-        this.currentAttr.value += toChar(cp);
-        this.state = ATTRIBUTE_VALUE_UNQUOTED_STATE;
-    }
+    else
+        this._reconsumeInState(ATTRIBUTE_VALUE_UNQUOTED_STATE);
 };
 
 
@@ -1894,54 +1782,25 @@ _[COMMENT_END_BANG_STATE] = function commentEndBangState(cp) {
 //12.2.4.52 DOCTYPE state
 //------------------------------------------------------------------
 _[DOCTYPE_STATE] = function doctypeState(cp) {
-    if (isWhitespace(cp))
-        this.state = BEFORE_DOCTYPE_NAME_STATE;
-
-    else if (cp === $.EOF) {
-        this._createDoctypeToken();
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
-    else
-        this._reconsumeInState(BEFORE_DOCTYPE_NAME_STATE);
-};
-
-
-//12.2.4.53 Before DOCTYPE name state
-//------------------------------------------------------------------
-_[BEFORE_DOCTYPE_NAME_STATE] = function beforeDoctypeNameState(cp) {
     if (isWhitespace(cp))
         return;
 
-    if (isAsciiUpper(cp)) {
-        this._createDoctypeToken(toAsciiLowerChar(cp));
-        this.state = DOCTYPE_NAME_STATE;
-    }
-
     else if (cp === $.GREATER_THAN_SIGN) {
-        this._createDoctypeToken();
+        this._createDoctypeToken(null);
         this.currentToken.forceQuirks = true;
         this._emitCurrentToken();
         this.state = DATA_STATE;
     }
 
     else if (cp === $.EOF) {
-        this._createDoctypeToken();
+        this._createDoctypeToken(null);
         this.currentToken.forceQuirks = true;
         this._emitCurrentToken();
         this._reconsumeInState(DATA_STATE);
     }
-
-    else if (cp === $.NULL) {
-        this._createDoctypeToken(UNICODE.REPLACEMENT_CHARACTER);
-        this.state = DOCTYPE_NAME_STATE;
-    }
-
     else {
-        this._createDoctypeToken(toChar(cp));
-        this.state = DOCTYPE_NAME_STATE;
+        this._createDoctypeToken('');
+        this._reconsumeInState(DOCTYPE_NAME_STATE);
     }
 };
 
@@ -1949,13 +1808,8 @@ _[BEFORE_DOCTYPE_NAME_STATE] = function beforeDoctypeNameState(cp) {
 //12.2.4.54 DOCTYPE name state
 //------------------------------------------------------------------
 _[DOCTYPE_NAME_STATE] = function doctypeNameState(cp) {
-    if (isWhitespace(cp))
-        this.state = AFTER_DOCTYPE_NAME_STATE;
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
+    if (isWhitespace(cp) || cp === $.GREATER_THAN_SIGN || cp === $.EOF)
+        this._reconsumeInState(AFTER_DOCTYPE_NAME_STATE);
 
     else if (isAsciiUpper(cp))
         this.currentToken.name += toAsciiLowerChar(cp);
@@ -1963,12 +1817,6 @@ _[DOCTYPE_NAME_STATE] = function doctypeNameState(cp) {
     else if (cp === $.NULL)
         this.currentToken.name += UNICODE.REPLACEMENT_CHARACTER;
 
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
     else
         this.currentToken.name += toChar(cp);
 };
@@ -1985,22 +1833,16 @@ _[AFTER_DOCTYPE_NAME_STATE] = function afterDoctypeNameState(cp) {
         this._emitCurrentToken();
     }
 
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
     else {
         var publicMatch = this._consumeSubsequentIfMatch($$.PUBLIC_STRING, cp, false),
             systemMatch = !publicMatch && this._consumeSubsequentIfMatch($$.SYSTEM_STRING, cp, false);
 
         if (!this._ensureHibernation()) {
             if (publicMatch)
-                this.state = AFTER_DOCTYPE_PUBLIC_KEYWORD_STATE;
+                this.state = BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE;
 
             else if (systemMatch)
-                this.state = AFTER_DOCTYPE_SYSTEM_KEYWORD_STATE;
+                this.state = BEFORE_DOCTYPE_SYSTEM_IDENTIFIER_STATE;
 
             else {
                 this.currentToken.forceQuirks = true;
@@ -2011,41 +1853,6 @@ _[AFTER_DOCTYPE_NAME_STATE] = function afterDoctypeNameState(cp) {
 };
 
 
-//12.2.4.56 After DOCTYPE public keyword state
-//------------------------------------------------------------------
-_[AFTER_DOCTYPE_PUBLIC_KEYWORD_STATE] = function afterDoctypePublicKeywordState(cp) {
-    if (isWhitespace(cp))
-        this.state = BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE;
-
-    else if (cp === $.QUOTATION_MARK) {
-        this.currentToken.publicId = '';
-        this.state = DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.APOSTROPHE) {
-        this.currentToken.publicId = '';
-        this.state = DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
-
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
-    else {
-        this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
-    }
-};
-
-
 //12.2.4.57 Before DOCTYPE public identifier state
 //------------------------------------------------------------------
 _[BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE] = function beforeDoctypePublicIdentifierState(cp) {
@@ -2062,21 +1869,9 @@ _[BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE] = function beforeDoctypePublicIdentifi
         this.state = DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE;
     }
 
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
-
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
     else {
         this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
+        this._reconsumeInState(BOGUS_DOCTYPE_STATE);
     }
 };
 
@@ -2085,7 +1880,7 @@ _[BEFORE_DOCTYPE_PUBLIC_IDENTIFIER_STATE] = function beforeDoctypePublicIdentifi
 //------------------------------------------------------------------
 _[DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED_STATE] = function doctypePublicIdentifierDoubleQuotedState(cp) {
     if (cp === $.QUOTATION_MARK)
-        this.state = AFTER_DOCTYPE_PUBLIC_IDENTIFIER_STATE;
+        this.state = BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE;
 
     else if (cp === $.NULL)
         this.currentToken.publicId += UNICODE.REPLACEMENT_CHARACTER;
@@ -2111,7 +1906,7 @@ _[DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED_STATE] = function doctypePublicIdentif
 //------------------------------------------------------------------
 _[DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE] = function doctypePublicIdentifierSingleQuotedState(cp) {
     if (cp === $.APOSTROPHE)
-        this.state = AFTER_DOCTYPE_PUBLIC_IDENTIFIER_STATE;
+        this.state = BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE;
 
     else if (cp === $.NULL)
         this.currentToken.publicId += UNICODE.REPLACEMENT_CHARACTER;
@@ -2133,40 +1928,6 @@ _[DOCTYPE_PUBLIC_IDENTIFIER_SINGLE_QUOTED_STATE] = function doctypePublicIdentif
 };
 
 
-//12.2.4.60 After DOCTYPE public identifier state
-//------------------------------------------------------------------
-_[AFTER_DOCTYPE_PUBLIC_IDENTIFIER_STATE] = function afterDoctypePublicIdentifierState(cp) {
-    if (isWhitespace(cp))
-        this.state = BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE;
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
-
-    else if (cp === $.QUOTATION_MARK) {
-        this.currentToken.systemId = '';
-        this.state = DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.APOSTROPHE) {
-        this.currentToken.systemId = '';
-        this.state = DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
-    else {
-        this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
-    }
-};
-
-
 //12.2.4.61 Between DOCTYPE public and system identifiers state
 //------------------------------------------------------------------
 _[BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE] = function betweenDoctypePublicAndSystemIdentifiersState(cp) {
@@ -2189,50 +1950,9 @@ _[BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS_STATE] = function betweenDoctype
         this.state = DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE;
     }
 
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
-    else {
-        this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
-    }
-};
-
-
-//12.2.4.62 After DOCTYPE system keyword state
-//------------------------------------------------------------------
-_[AFTER_DOCTYPE_SYSTEM_KEYWORD_STATE] = function afterDoctypeSystemKeywordState(cp) {
-    if (isWhitespace(cp))
-        this.state = BEFORE_DOCTYPE_SYSTEM_IDENTIFIER_STATE;
-
-    else if (cp === $.QUOTATION_MARK) {
-        this.currentToken.systemId = '';
-        this.state = DOCTYPE_SYSTEM_IDENTIFIER_DOUBLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.APOSTROPHE) {
-        this.currentToken.systemId = '';
-        this.state = DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE;
-    }
-
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
-
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
     else {
         this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
+        this._reconsumeInState(BOGUS_DOCTYPE_STATE);
     }
 };
 
@@ -2253,21 +1973,9 @@ _[BEFORE_DOCTYPE_SYSTEM_IDENTIFIER_STATE] = function beforeDoctypeSystemIdentifi
         this.state = DOCTYPE_SYSTEM_IDENTIFIER_SINGLE_QUOTED_STATE;
     }
 
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this.state = DATA_STATE;
-    }
-
-    else if (cp === $.EOF) {
-        this.currentToken.forceQuirks = true;
-        this._emitCurrentToken();
-        this._reconsumeInState(DATA_STATE);
-    }
-
     else {
         this.currentToken.forceQuirks = true;
-        this.state = BOGUS_DOCTYPE_STATE;
+        this._reconsumeInState(BOGUS_DOCTYPE_STATE);
     }
 };