Avoid code duplication for attribute reading.

Author: RReverser

lib/tokenizer/index.js

@@ -1333,56 +1333,32 @@ _[BEFORE_ATTRIBUTE_NAME_STATE] = function beforeAttributeNameState(cp) {
     if (isWhitespace(cp))
         return;
 
-    if (cp === $.SOLIDUS)
-        this.state = SELF_CLOSING_START_TAG_STATE;
+    if (cp === $.SOLIDUS || cp === $.GREATER_THAN_SIGN || cp === $.EOF)
+        this._reconsumeInState(AFTER_ATTRIBUTE_NAME_STATE);
 
-    else if (cp === $.GREATER_THAN_SIGN) {
-        this.state = DATA_STATE;
-        this._emitCurrentToken();
-    }
-
-    else if (isAsciiUpper(cp)) {
-        this._createAttr(toAsciiLowerChar(cp));
+    else if (cp === $.EQUALS_SIGN) {
+        this._createAttr('=');
         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 || 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);
     }
 };
 
 
 //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);
 
@@ -1392,9 +1368,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);
 };
@@ -1417,27 +1390,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);
     }
 };
 
@@ -1451,34 +1409,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);
 };