Changeset 88094 in webkit for trunk/Source/JavaScriptCore/parser/Lexer.cpp

Timestamp:

Jun 3, 2011, 11:15:43 PM (14 years ago)

Author:

[email protected]

Message:

2011-06-03 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

Lexer needs to provide Identifier for reserved words
​https://bugs.webkit.org/show_bug.cgi?id=62086

Alas it is necessary to provide an Identifier reference for keywords
so that we can do the right thing when they're used in object literals.
We now keep Identifiers for all reserved words in the CommonIdentifiers
structure so that we can access them without a hash lookup.

• KeywordLookupGenerator.py:
• parser/Lexer.cpp: (JSC::Lexer::parseIdentifier):
• parser/Lexer.h:
• runtime/CommonIdentifiers.cpp: (JSC::CommonIdentifiers::CommonIdentifiers):
• runtime/CommonIdentifiers.h:

File:

• trunk/Source/JavaScriptCore/parser/Lexer.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -415 +415 @@
     const ptrdiff_t remaining = m_codeEnd - m_code;
     if ((remaining >= maxTokenLength) && !(lexType & IgnoreReservedWords)) {
-        JSTokenType keyword = parseKeyword();
-        if (keyword != IDENT)
+        JSTokenType keyword = parseKeyword<shouldCreateIdentifier>(lvalp);
+        if (keyword != IDENT) {
+            ASSERT((!shouldCreateIdentifier) || lvalp->ident);
             return keyword;
+        }
     }
     const UChar* identifierStart = currentCharacter();