Changeset 89109 in webkit

Timestamp:

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

Author:

barraclough@apple.com

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):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/keywords-and-reserved_words-expected.txt (added)
• LayoutTests/fast/js/keywords-and-reserved_words.html (added)
• LayoutTests/fast/js/script-tests/keywords-and-reserved_words.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/JSParser.h (modified) (1 diff)
• Source/JavaScriptCore/parser/Keywords.table (modified) (2 diffs)
• Source/JavaScriptCore/parser/Lexer.cpp (modified) (3 diffs)
• Source/JavaScriptCore/parser/Lexer.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/CommonIdentifiers.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-16  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53014
+        ES5 strict mode keyword restrictions aren't implemented
+
+        The following are future restricted words is strict mode code:
+            implements, interface, let, package, private, protected, public, static, yield
+
+        * 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):
+
 2011-06-16  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-16  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53014
+        ES5 strict mode keyword restrictions aren't implemented
+
+        The following are future restricted words is strict mode code:
+            implements, interface, let, package, private, protected, public, static, yield
+
+        * 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.
+
 2011-06-16  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/parser/JSParser.h

@@ -67 +67 @@
     WITH,
     RESERVED,
+    RESERVED_IF_STRICT,
     THROW,
     TRY,

trunk/Source/JavaScriptCore/parser/Keywords.table

@@ -1 +1 @@
 # main keywords
-@begin mainTable 41
+@begin mainTable 47
 
 # types
@@ -44 +44 @@
 super           RESERVED
 
-# these words are reserved for future use in the ECMA spec, but not in WinIE
-# (see http://bugs.webkit.org/show_bug.cgi?id=6179)
-# abstract      RESERVED
-# boolean       RESERVED
-# byte          RESERVED
-# char          RESERVED
-# double        RESERVED
-# final         RESERVED
-# float         RESERVED
-# goto          RESERVED
-# implements    RESERVED
-# int           RESERVED
-# interface     RESERVED
-# long          RESERVED
-# native        RESERVED
-# package       RESERVED
-# private       RESERVED
-# protected     RESERVED
-# public        RESERVED
-# short         RESERVED
-# static        RESERVED
-# synchronized  RESERVED
-# throws        RESERVED
-# transient     RESERVED
-# volatile      RESERVED
+# reserved for future use in strict code
+implements      RESERVED_IF_STRICT
+interface       RESERVED_IF_STRICT
+let             RESERVED_IF_STRICT
+package         RESERVED_IF_STRICT
+private         RESERVED_IF_STRICT
+protected       RESERVED_IF_STRICT
+public          RESERVED_IF_STRICT
+static          RESERVED_IF_STRICT
+yield           RESERVED_IF_STRICT
+
 @end
 

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:

trunk/Source/JavaScriptCore/parser/Lexer.h

@@ -119 +119 @@
         template <int shiftAmount, ShiftType shouldBoundsCheck> void internalShift();
         template <bool shouldCreateIdentifier> ALWAYS_INLINE JSTokenType parseKeyword(JSTokenData*);
-        template <bool shouldBuildIdentifiers> ALWAYS_INLINE JSTokenType parseIdentifier(JSTokenData*, unsigned);
+        template <bool shouldBuildIdentifiers> ALWAYS_INLINE JSTokenType parseIdentifier(JSTokenData*, unsigned, bool strictMode);
         template <bool shouldBuildStrings> ALWAYS_INLINE bool parseString(JSTokenData*, bool strictMode);
         ALWAYS_INLINE void parseHex(double& returnValue);

trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -112 +112 @@
     macro(extends) \
     macro(import) \
-    macro(super)
+    macro(super) \
+    macro(implements) \
+    macro(interface) \
+    macro(let) \
+    macro(package) \
+    macro(private) \
+    macro(protected) \
+    macro(public) \
+    macro(static) \
+    macro(yield)
 
 namespace JSC {