Changeset 34607 in webkit for trunk/JavaScriptCore/kjs/lexer.cpp

Timestamp:

Jun 16, 2008, 4:28:38 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Make Identifier construction use an explicitly passed IdentifierTable.

No change on SunSpider total.

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -60 +60 @@
 static const size_t initialStringTableCapacity = 64;
 
-Lexer::Lexer()
+Lexer::Lexer(JSGlobalData* globalData)
     : yylineno(1)
     , restrKeyword(false)
@@ -74 +74 @@
     , next2(0)
     , next3(0)
+    , m_globalData(globalData)
     , mainTable(KJS::mainTable)
 {
@@ -550 +551 @@
     token = IDENT;
     break;
-  case IdentifierOrKeyword:
+  case IdentifierOrKeyword: {
     lvalp->ident = makeIdentifier(m_buffer16);
-    if ((token = mainTable.value(*lvalp->ident)) < 0) {
+    const HashEntry* entry = mainTable.entry(m_globalData, *lvalp->ident);
+    if (!entry) {
       // Lookup for keyword failed, means this is an identifier.
       token = IDENT;
       break;
     }
+    token = entry->integerValue;
     // Hack for "f = function somename() { ... }"; too hard to get into the grammar.
     eatNextIdentifier = token == FUNCTION && lastToken == '=';
@@ -562 +565 @@
       restrKeyword = true;
     break;
+  }
   case String:
     lvalp->string = makeUString(m_buffer16);
@@ -887 +891 @@
 Identifier* Lexer::makeIdentifier(const Vector<UChar>& buffer)
 {
-    KJS::Identifier* identifier = new KJS::Identifier(buffer.data(), buffer.size());
+    KJS::Identifier* identifier = new KJS::Identifier(m_globalData, buffer.data(), buffer.size());
     m_identifiers.append(identifier);
     return identifier;