Changeset 66962 in webkit for trunk/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Sep 8, 2010, 2:59:24 AM (15 years ago)

Author:

[email protected]

Message:

Refactoring multiline comments in the lexer
​https://bugs.webkit.org/show_bug.cgi?id=45289

Reviewed by Darin Adler.

MultiLine comment parsing is moved to a separate function.

Slight performance increase on --parse-only tests (from 33.6ms to 32.8ms)
SunSpider reports no change (from 523.1ms to 521.2ms).

• parser/Lexer.cpp:

(JSC::Lexer::parseMultilineComment):
(JSC::Lexer::lex):

• parser/Lexer.h:

File:

• trunk/JavaScriptCore/parser/Lexer.cpp (modified) (3 diffs)

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -676 +676 @@
 }
 
+ALWAYS_INLINE bool Lexer::parseMultilineComment()
+{
+    while (true) {
+        while (UNLIKELY(m_current == '*')) {
+            shift();
+            if (m_current == '/') {
+                shift();
+                return true;
+            }
+        }
+
+        if (UNLIKELY(m_current == -1))
+            return false;
+
+        if (isLineTerminator(m_current))
+            shiftLineTerminator();
+        else
+            shift();
+    }
+}
+
 JSTokenType Lexer::lex(JSTokenData* lvalp, JSTokenInfo* llocp, LexType lexType)
 {
@@ -836 +857 @@
         if (m_current == '*') {
             shift();
-            goto inMultiLineComment;
+            if (parseMultilineComment())
+                goto start;
+            goto returnError;
         }
         if (m_current == '=') {
@@ -1029 +1052 @@
     goto start;
 
-inMultiLineComment:
-    while (true) {
-        if (UNLIKELY(m_current == '*')) {
-            shift();
-            if (m_current == '/')
-                break;
-            if (m_current == '*')
-                continue;
-        }
-
-        if (UNLIKELY(m_current == -1))
-            goto returnError;
-
-        if (isLineTerminator(m_current))
-            shiftLineTerminator();
-        else
-            shift();
-    }
-    shift();
-    goto start;
-
 doneSemicolon:
     token = SEMICOLON;