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

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.h (modified) (5 diffs)

trunk/JavaScriptCore/parser/Lexer.h

@@ -24 +24 @@
 
 #include "Lookup.h"
-#include "ParserArena.h"
+#include "SegmentedVector.h"
 #include "SourceCode.h"
 #include <wtf/ASCIICType.h>
@@ -43 +43 @@
 
         // Functions to set up parsing.
-        void setCode(const SourceCode&, ParserArena&);
+        void setCode(const SourceCode&);
         void setIsReparsing() { m_isReparsing = true; }
 
@@ -51 +51 @@
         bool prevTerminator() const { return m_terminator; }
         SourceCode sourceCode(int openBrace, int closeBrace, int firstLine);
-        bool scanRegExp(const Identifier*& pattern, const Identifier*& flags, UChar prefix = 0);
-        bool skipRegExp();
+        bool scanRegExp();
+        const UString& pattern() const { return m_pattern; }
+        const UString& flags() const { return m_flags; }
 
         // Functions for use after parsing.
@@ -79 +80 @@
         const UChar* currentCharacter() const;
 
-        const Identifier* makeIdentifier(const UChar* characters, size_t length);
+        JSC::Identifier* makeIdentifier(const UChar* buffer, size_t length);
 
         bool lastTokenWasRestrKeyword() const;
 
         static const size_t initialReadBufferCapacity = 32;
+        static const size_t initialIdentifierTableCapacity = 64;
 
         int m_lineNumber;
@@ -107 +109 @@
         int m_next3;
         
-        IdentifierArena* m_arena;
+        SegmentedVector<JSC::Identifier, initialIdentifierTableCapacity> m_identifiers;
 
         JSGlobalData* m_globalData;
+
+        UString m_pattern;
+        UString m_flags;
 
         const HashTable m_keywordTable;