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

Timestamp:

Jun 16, 2011, 8:17:11 PM (14 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=53014
ES5 strict mode keyword restrictions aren't implemented

Reviewed by Oliver Hunt.

The following are future restricted words is strict mode code:

implements, interface, let, package, private, protected, public, static, yield

Source/JavaScriptCore:

• parser/JSParser.h:
  • Add RESERVED_IF_STRICT token.
• parser/Keywords.table:
  • Add new future restricted words.
• parser/Lexer.cpp:

(JSC::Lexer::parseIdentifier):

• Check for RESERVED_IF_STRICT; in nonstrict code this is converted to IDENT.

(JSC::Lexer::lex):

• Pass strictMode flag to parseIdentifier.

• parser/Lexer.h:
  • parseIdentifier needs a strictMode flag.
• runtime/CommonIdentifiers.h:
  • Add identifiers for new reserved words.

LayoutTests:

• fast/js/keywords-and-reserved_words-expected.txt: Added.
• fast/js/keywords-and-reserved_words.html: Added.
• fast/js/script-tests/keywords-and-reserved_words.js: Added.

(isKeyword):
(isStrictKeyword):
(classifyIdentifier):

File:

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

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -406 +406 @@
 }
 
-template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer::parseIdentifier(JSTokenData* tokenData, unsigned lexType)
+template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType Lexer::parseIdentifier(JSTokenData* tokenData, unsigned lexType, bool strictMode)
 {
     const ptrdiff_t remaining = m_codeEnd - m_code;
     if ((remaining >= maxTokenLength) && !(lexType & IgnoreReservedWords)) {
         JSTokenType keyword = parseKeyword<shouldCreateIdentifier>(tokenData);
-        if (keyword != IDENT) {
+        if (keyword != IDENT && (keyword != RESERVED_IF_STRICT || strictMode)) {
             ASSERT((!shouldCreateIdentifier) || tokenData->ident);
             return keyword;
@@ -470 +470 @@
             const HashEntry* entry = m_keywordTable.entry(m_globalData, *ident);
             ASSERT((remaining < maxTokenLength) || !entry);
-            return entry ? static_cast<JSTokenType>(entry->lexerValue()) : IDENT;
+            if (!entry)
+                return IDENT;
+            JSTokenType token = static_cast<JSTokenType>(entry->lexerValue());
+            return (token != RESERVED_IF_STRICT) || strictMode ? token : IDENT;
         }
         return IDENT;
@@ -1083 +1086 @@
     case CharacterBackSlash:
         if (lexType & DontBuildKeywords)
-            token = parseIdentifier<false>(tokenData, lexType);
+            token = parseIdentifier<false>(tokenData, lexType, strictMode);
         else
-            token = parseIdentifier<true>(tokenData, lexType);
+            token = parseIdentifier<true>(tokenData, lexType, strictMode);
         break;
     case CharacterLineTerminator: