Changeset 60702 in webkit

Timestamp:

Jun 4, 2010 12:54:33 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-04 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Make HTML5Lexer go fast
​https://bugs.webkit.org/show_bug.cgi?id=40048

Fix the rest of the RECONSUME_IN cases that were missed by our script.
Also, reorder some assigment to prepare for the ADVANCE_TO patch.

• html/HTML5Lexer.cpp: (WebCore::HTML5Lexer::nextToken):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTML5Lexer.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Make HTML5Lexer go fast
+        https://bugs.webkit.org/show_bug.cgi?id=40048
+
+        Fix the rest of the RECONSUME_IN cases that were missed by our script.
+        Also, reorder some assigment to prepare for the ADVANCE_TO patch.
+
+        * html/HTML5Lexer.cpp:
+        (WebCore::HTML5Lexer::nextToken):
+
 2010-06-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTML5Lexer.cpp

@@ -452 +452 @@
             } else if (cc == '?') {
                 emitParseError();
-                m_state = BogusCommentState;
                 // The spec consumes the current character before switching
                 // to the bogus comment state, but it's easier to implement
                 // if we reconsume the current character.
-                continue;
-            } else {
-                emitParseError();
-                m_state = DataState;
+                RECONSUME_IN(BogusCommentState);
+            } else {
+                emitParseError();
                 emitCharacter('<');
-                continue;
+                RECONSUME_IN(DataState);
             }
             break;
@@ -1029 +1027 @@
                 m_state = AfterAttributeValueQuotedState;
             else if (cc == '&') {
+                m_additionalAllowedCharacter = '"';
                 m_state = CharacterReferenceInAttributeValueState;
-                m_additionalAllowedCharacter = '"';
             } else
                 m_token->appendToAttributeValue(cc);
@@ -1042 +1040 @@
                 m_state = AfterAttributeValueQuotedState;
             else if (cc == '&') {
+                m_additionalAllowedCharacter = '\'';
                 m_state = CharacterReferenceInAttributeValueState;
-                m_additionalAllowedCharacter = '\'';
             } else
                 m_token->appendToAttributeValue(cc);
@@ -1055 +1053 @@
                 m_state = BeforeAttributeNameState;
             else if (cc == '&') {
+                m_additionalAllowedCharacter = '>';
                 m_state = CharacterReferenceInAttributeValueState;
-                m_additionalAllowedCharacter = '>';
             } else if (cc == '>') {
                 EMIT_AND_RESUME_IN(DataState);
@@ -1087 +1085 @@
             // state can be determined by m_additionalAllowedCharacter.
             if (m_additionalAllowedCharacter == '"')
-                m_state = AttributeValueDoubleQuotedState;
+                RECONSUME_IN(AttributeValueDoubleQuotedState)
             else if (m_additionalAllowedCharacter == '\'')
-                m_state = AttributeValueSingleQuotedState;
+                RECONSUME_IN(AttributeValueSingleQuotedState)
             else if (m_additionalAllowedCharacter == '>')
-                m_state = AttributeValueUnquotedState;
+                RECONSUME_IN(AttributeValueUnquotedState)
             else
                 ASSERT_NOT_REACHED();
-            continue;
+            break;
         }
         END_STATE()