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

Timestamp:

May 13, 2009, 2:53:59 PM (16 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

WebCore:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

WebKit/mac:

2009-05-13 Darin Adler <Darin Adler>

Revert the parser arena change. It was a slowdown, not a speedup.
Better luck next time (I'll break it up into pieces).

File:

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

trunk/JavaScriptCore/parser/Lexer.cpp

@@ -142 +142 @@
 }
 
-void Lexer::setCode(const SourceCode& source, ParserArena& arena)
-{
-    m_arena = &arena.identifierArena();
-
+void Lexer::setCode(const SourceCode& source)
+{
     m_lineNumber = source.firstLine();
     m_delimited = false;
@@ -207 +205 @@
 }
 
-ALWAYS_INLINE const Identifier* Lexer::makeIdentifier(const UChar* characters, size_t length)
-{
-    return &JSC::makeIdentifier(*m_arena, m_globalData, characters, length);
+ALWAYS_INLINE Identifier* Lexer::makeIdentifier(const UChar* characters, size_t length)
+{
+    m_identifiers.append(Identifier(m_globalData, characters, length));
+    return &m_identifiers.last();
 }
 
@@ -910 +909 @@
 }
 
-bool Lexer::scanRegExp(const Identifier*& pattern, const Identifier*& flags, UChar prefix)
+bool Lexer::scanRegExp()
 {
     ASSERT(m_buffer16.isEmpty());
 
-    bool lastWasEscape = false;
-    bool inBrackets = false;
-
-    if (prefix)
-        record16(prefix);
-
-    while (true) {
-        if (isLineTerminator(m_current) || m_current == -1) {
-            m_buffer16.resize(0);
-            return false;
-        }
-        if (m_current != '/' || lastWasEscape || inBrackets) {
-            // keep track of '[' and ']'
-            if (!lastWasEscape) {
-                if (m_current == '[' && !inBrackets)
-                    inBrackets = true;
-                if (m_current == ']' && inBrackets)
-                    inBrackets = false;
-            }
-            record16(m_current);
-            lastWasEscape = !lastWasEscape && m_current == '\\';
-        } else { // end of regexp
-            pattern = makeIdentifier(m_buffer16.data(), m_buffer16.size());
-            m_buffer16.resize(0);
-            shift1();
-            break;
-        }
-        shift1();
-    }
-
-    while (isIdentPart(m_current)) {
-        record16(m_current);
-        shift1();
-    }
-    flags = makeIdentifier(m_buffer16.data(), m_buffer16.size());
-    m_buffer16.resize(0);
-
-    return true;
-}
-
-bool Lexer::skipRegExp()
-{
     bool lastWasEscape = false;
     bool inBrackets = false;
@@ -970 +927 @@
                     inBrackets = false;
             }
+            record16(m_current);
             lastWasEscape = !lastWasEscape && m_current == '\\';
         } else { // end of regexp
-            shift1();
-            break;
-        }
-        shift1();
-    }
-
-    while (isIdentPart(m_current))
-        shift1();
+            m_pattern = UString(m_buffer16);
+            m_buffer16.resize(0);
+            shift1();
+            break;
+        }
+        shift1();
+    }
+
+    while (isIdentPart(m_current)) {
+        record16(m_current);
+        shift1();
+    }
+    m_flags = UString(m_buffer16);
+    m_buffer16.resize(0);
 
     return true;
@@ -986 +950 @@
 void Lexer::clear()
 {
-    m_arena = 0;
+    m_identifiers.clear();
     m_codeWithoutBOMs.clear();
 
@@ -998 +962 @@
 
     m_isReparsing = false;
+
+    m_pattern = UString();
+    m_flags = UString();
 }