Changeset 88094 in webkit

Timestamp:

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

Author:

oliver@apple.com

Message:

2011-06-03 Oliver Hunt <​oliver@apple.com>

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• KeywordLookupGenerator.py (modified) (2 diffs)
• parser/Lexer.cpp (modified) (1 diff)
• parser/Lexer.h (modified) (1 diff)
• runtime/CommonIdentifiers.cpp (modified) (2 diffs)
• runtime/CommonIdentifiers.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-03  Oliver Hunt  <oliver@apple.com>
+
+        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:
+
 2011-06-03  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/KeywordLookupGenerator.py

@@ -128 +128 @@
             print(str + "if (!isIdentPart(code[%d])) {" % (len(self.fullPrefix)))
             print(str + "    internalShift<%d, DoNotBoundsCheck>();" % len(self.fullPrefix))
+            print(str + "    if (shouldCreateIdentifier)")
+            print(str + ("        data->ident = &m_globalData->propertyNames->%sKeyword;" % self.fullPrefix))
             print(str + "    return " + self.value + ";")
             print(str + "}")
@@ -167 +169 @@
         # max length + 1 so we don't need to do any bounds checking at all
         print("static const int maxTokenLength = %d;" % (self.maxLength() + 1))
-        print("ALWAYS_INLINE JSTokenType Lexer::parseKeyword() {")
+        print("template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer::parseKeyword(JSTokenData* data) {")
         print("    ASSERT(m_codeEnd - m_code >= maxTokenLength);")
         print("    const UChar* code = m_code;")

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();

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -116 +116 @@
         enum ShiftType { DoBoundsCheck, DoNotBoundsCheck };
         template <int shiftAmount, ShiftType shouldBoundsCheck> void internalShift();
-        ALWAYS_INLINE JSTokenType parseKeyword();
+        template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType parseKeyword(JSTokenData*);
         template <bool shouldBuildIdentifiers> ALWAYS_INLINE JSTokenType parseIdentifier(JSTokenData*, unsigned);
         template <bool shouldBuildStrings> ALWAYS_INLINE bool parseString(JSTokenData* lvalp, bool strictMode);

trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp

@@ -27 +27 @@
 
 #define INITIALIZE_PROPERTY_NAME(name) , name(globalData, #name)
+#define INITIALIZE_KEYWORD(name) , name##Keyword(globalData, #name)
 
 CommonIdentifiers::CommonIdentifiers(JSGlobalData* globalData)
@@ -34 +35 @@
     , thisIdentifier(globalData, "this")
     , useStrictIdentifier(globalData, "use strict")
+    JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD)
     JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
 {

trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -76 +76 @@
     macro(displayName)
 
+#define JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(macro) \
+    macro(null) \
+    macro(true) \
+    macro(false) \
+    macro(break) \
+    macro(case) \
+    macro(catch) \
+    macro(const) \
+    macro(default) \
+    macro(finally) \
+    macro(for) \
+    macro(instanceof) \
+    macro(new) \
+    macro(var) \
+    macro(continue) \
+    macro(function) \
+    macro(return) \
+    macro(void) \
+    macro(delete) \
+    macro(if) \
+    macro(this) \
+    macro(do) \
+    macro(while) \
+    macro(else) \
+    macro(in) \
+    macro(switch) \
+    macro(throw) \
+    macro(try) \
+    macro(typeof) \
+    macro(with) \
+    macro(debugger) \
+    macro(class) \
+    macro(enum) \
+    macro(export) \
+    macro(extends) \
+    macro(import) \
+    macro(super)
+
 namespace JSC {
 
@@ -91 +129 @@
         const Identifier useStrictIdentifier;
 
+        
+#define JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL(name) const Identifier name##Keyword;
+        JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL)
+#undef JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL
+        
 #define JSC_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) const Identifier name;
         JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(JSC_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL)