[tokenizer] simplified logic

kirbysayshi · Mar 31, 2013 · e4982e1 · e4982e1
1 parent db95f00
commit e4982e1
Showing 1 changed file with 12 additions and 23 deletions.
diff --git a/lib/Tokenizer.js b/lib/Tokenizer.js
@@ -166,14 +166,14 @@ Parser.prototype.write = function(chunk){
 		*	attributes
 		*/
 		else if(this._state === BEFORE_ATTRIBUTE_NAME){
-			if(c === "/"){
-				this._cbs.onopentagend();
-				this._cbs.onselfclosingtag();
-				this._state = AFTER_CLOSING_TAG_NAME;
-			} else if(c === ">"){
+			if(c === ">"){
 				this._state = TEXT;
 				this._cbs.onopentagend();
 				this._sectionStart = this._index + 1;
+			} else if(c === "/"){
+				this._cbs.onopentagend();
+				this._cbs.onselfclosingtag();
+				this._state = AFTER_CLOSING_TAG_NAME;
 			} else if(!whitespace(c)){
 				this._state = IN_ATTRIBUTE_NAME;
 				this._sectionStart = this._index;
@@ -182,31 +182,20 @@ Parser.prototype.write = function(chunk){
 			if(c === "="){
 				this._emitIfToken("attribname");
 				this._state = BEFORE_ATTRIBUTE_VALUE;
-			} else if(c === "/"){
-				this._emitIfToken("attribname");
-				this._cbs.onopentagend();
-				this._cbs.onselfclosingtag();
-				this._state = AFTER_CLOSING_TAG_NAME;
-			} else if(c === ">"){
-				this._emitIfToken("attribname");
-				this._state = TEXT;
-				this._cbs.onopentagend();
-				this._sectionStart = this._index + 1;
 			} else if(whitespace(c)){
 				this._emitIfToken("attribname");
 				this._state = AFTER_ATTRIBUTE_NAME;
+			} else if(c === "/" || c === ">"){
+				this._emitIfToken("attribname");
+				this._state = BEFORE_ATTRIBUTE_NAME;
+				this._index--;
 			}
 		} else if(this._state === AFTER_ATTRIBUTE_NAME){
 			if(c === "="){
 				this._state = BEFORE_ATTRIBUTE_VALUE;
-			} else if(c === "/"){
-				this._cbs.onopentagend();
-				this._cbs.onselfclosingtag();
-				this._state = AFTER_CLOSING_TAG_NAME;
-			} else if(c === ">"){
-				this._state = TEXT;
-				this._cbs.onopentagend();
-				this._sectionStart = this._index + 1;
+			} else if(c === "/" || c === ">"){
+				this._state = BEFORE_ATTRIBUTE_NAME;
+				this._index--;
 			} else if(!whitespace(c)){
 				this._state = IN_ATTRIBUTE_NAME;
 				this._sectionStart = this._index;