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

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.h (modified) (1 diff)

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