src/parser.cc - Issue 7207007: Proper handling of future reserved words in strict and normal mode.

Unified Diff: src/parser.cc

Issue 7207007: Proper handling of future reserved words in strict and normal mode. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: addressed comments Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/parser.cc

diff --git a/src/parser.cc b/src/parser.cc

index b04a2f93b2dfbee458be86b2c5545094cfc8bda2..a228c7dcac7edb711228da5664cb500661f3c39b 100644

--- a/src/parser.cc

+++ b/src/parser.cc

@@ -1445,10 +1445,11 @@ Statement* Parser::ParseFunctionDeclaration(bool* ok) {

// 'function' Identifier '(' FormalParameterListopt ')' '{' FunctionBody '}'

Expect(Token::FUNCTION, CHECK_OK);

int function_token_position = scanner().location().beg_pos;

- bool is_reserved = false;

- Handle<String> name = ParseIdentifierOrReservedWord(&is_reserved, CHECK_OK);

+ bool is_strict_reserved = false;

+ Handle<String> name = ParseIdentifierOrStrictReservedWord(

+ &is_strict_reserved, CHECK_OK);

FunctionLiteral* fun = ParseFunctionLiteral(name,

- is_reserved,

+ is_strict_reserved,

function_token_position,

DECLARATION,

CHECK_OK);

@@ -2770,11 +2771,12 @@ Expression* Parser::ParseMemberWithNewPrefixesExpression(PositionStack* stack,

Expect(Token::FUNCTION, CHECK_OK);

int function_token_position = scanner().location().beg_pos;

Handle<String> name;

- bool is_reserved_name = false;

+ bool is_strict_reserved_name = false;

if (peek_any_identifier()) {

- name = ParseIdentifierOrReservedWord(&is_reserved_name, CHECK_OK);

+ name = ParseIdentifierOrStrictReservedWord(&is_strict_reserved_name,

+ CHECK_OK);

}

- result = ParseFunctionLiteral(name, is_reserved_name,

+ result = ParseFunctionLiteral(name, is_strict_reserved_name,

function_token_position, NESTED, CHECK_OK);

} else {

result = ParsePrimaryExpression(CHECK_OK);

@@ -2845,6 +2847,9 @@ void Parser::ReportUnexpectedToken(Token::Value token) {

return ReportMessage("unexpected_token_identifier",

Vector<const char*>::empty());

case Token::FUTURE_RESERVED_WORD:

+ return ReportMessage("unexpected_reserved",

+ Vector<const char*>::empty());

+ case Token::FUTURE_STRICT_RESERVED_WORD:

return ReportMessage(top_scope_->is_strict_mode() ?

"unexpected_strict_reserved" :

"unexpected_token_identifier",

@@ -2905,7 +2910,7 @@ Expression* Parser::ParsePrimaryExpression(bool* ok) {

break;

case Token::IDENTIFIER:

- case Token::FUTURE_RESERVED_WORD: {

+ case Token::FUTURE_STRICT_RESERVED_WORD: {

Handle<String> name = ParseIdentifier(CHECK_OK);

if (fni_ != NULL) fni_->PushVariableName(name);

result = top_scope_->NewUnresolved(name,

@@ -3316,6 +3321,7 @@ ObjectLiteral::Property* Parser::ParseObjectLiteralGetSet(bool is_getter,

bool is_keyword = Token::IsKeyword(next);

if (next == Token::IDENTIFIER || next == Token::NUMBER ||

next == Token::FUTURE_RESERVED_WORD ||

+ next == Token::FUTURE_STRICT_RESERVED_WORD ||

next == Token::STRING || is_keyword) {

Handle<String> name;

if (is_keyword) {

@@ -3370,11 +3376,12 @@ Expression* Parser::ParseObjectLiteral(bool* ok) {

switch (next) {

case Token::FUTURE_RESERVED_WORD:

+ case Token::FUTURE_STRICT_RESERVED_WORD:

case Token::IDENTIFIER: {

bool is_getter = false;

bool is_setter = false;

Handle<String> id =

- ParseIdentifierOrGetOrSet(&is_getter, &is_setter, CHECK_OK);

+ ParseIdentifierNameOrGetOrSet(&is_getter, &is_setter, CHECK_OK);

if (fni_ != NULL) fni_->PushLiteralName(id);

if ((is_getter || is_setter) && peek() != Token::COLON) {

@@ -3533,7 +3540,7 @@ ZoneList<Expression*>* Parser::ParseArguments(bool* ok) {

FunctionLiteral* Parser::ParseFunctionLiteral(Handle<String> var_name,

- bool name_is_reserved,

+ bool name_is_strict_reserved,

int function_token_position,

FunctionLiteralType type,

bool* ok) {

@@ -3577,9 +3584,10 @@ FunctionLiteral* Parser::ParseFunctionLiteral(Handle<String> var_name,

bool done = (peek() == Token::RPAREN);

while (!done) {

- bool is_reserved = false;

+ bool is_strict_reserved = false;

Handle<String> param_name =

- ParseIdentifierOrReservedWord(&is_reserved, CHECK_OK);

+ ParseIdentifierOrStrictReservedWord(&is_strict_reserved,

+ CHECK_OK);

// Store locations for possible future error reports.

if (!name_loc.IsValid() && IsEvalOrArguments(param_name)) {

@@ -3589,7 +3597,7 @@ FunctionLiteral* Parser::ParseFunctionLiteral(Handle<String> var_name,

has_duplicate_parameters = true;

dupe_loc = scanner().location();

}

- if (!reserved_loc.IsValid() && is_reserved) {

+ if (!reserved_loc.IsValid() && is_strict_reserved) {

reserved_loc = scanner().location();

}

@@ -3691,7 +3699,7 @@ FunctionLiteral* Parser::ParseFunctionLiteral(Handle<String> var_name,

*ok = false;

return NULL;

}

- if (name_is_reserved) {

+ if (name_is_strict_reserved) {

int position = function_token_position != RelocInfo::kNoPosition

? function_token_position

: (start_pos > 0 ? start_pos - 1 : start_pos);

@@ -3780,7 +3788,8 @@ Expression* Parser::ParseV8Intrinsic(bool* ok) {

bool Parser::peek_any_identifier() {

Token::Value next = peek();

return next == Token::IDENTIFIER ||

- next == Token::FUTURE_RESERVED_WORD;

+ next == Token::FUTURE_RESERVED_WORD ||

+ next == Token::FUTURE_STRICT_RESERVED_WORD;

}

@@ -3843,21 +3852,22 @@ Literal* Parser::GetLiteralNumber(double value) {

Handle<String> Parser::ParseIdentifier(bool* ok) {

- bool is_reserved;

- return ParseIdentifierOrReservedWord(&is_reserved, ok);

+ if (top_scope_->is_strict_mode()) {

+ Expect(Token::IDENTIFIER, ok);

+ } else if (!Check(Token::IDENTIFIER)) {

+ Expect(Token::FUTURE_STRICT_RESERVED_WORD, ok);

+ }

+ if (!*ok) return Handle<String>();

+ return GetSymbol(ok);

}

-Handle<String> Parser::ParseIdentifierOrReservedWord(bool* is_reserved,

- bool* ok) {

- *is_reserved = false;

- if (top_scope_->is_strict_mode()) {

- Expect(Token::IDENTIFIER, ok);

- } else {

- if (!Check(Token::IDENTIFIER)) {

- Expect(Token::FUTURE_RESERVED_WORD, ok);

- *is_reserved = true;

- }

+Handle<String> Parser::ParseIdentifierOrStrictReservedWord(

+ bool* is_strict_reserved, bool* ok) {

+ *is_strict_reserved = false;

+ if (!Check(Token::IDENTIFIER)) {

+ Expect(Token::FUTURE_STRICT_RESERVED_WORD, ok);

+ *is_strict_reserved = true;

}

if (!*ok) return Handle<String>();

return GetSymbol(ok);

@@ -3867,8 +3877,9 @@ Handle<String> Parser::ParseIdentifierOrReservedWord(bool* is_reserved,

Handle<String> Parser::ParseIdentifierName(bool* ok) {

Token::Value next = Next();

if (next != Token::IDENTIFIER &&

- next != Token::FUTURE_RESERVED_WORD &&

- !Token::IsKeyword(next)) {

+ next != Token::FUTURE_RESERVED_WORD &&

+ next != Token::FUTURE_STRICT_RESERVED_WORD &&

+ !Token::IsKeyword(next)) {

ReportUnexpectedToken(next);

*ok = false;

return Handle<String>();

@@ -3911,10 +3922,10 @@ void Parser::CheckOctalLiteral(int beg_pos, int end_pos, bool* ok) {

// This function reads an identifier and determines whether or not it

// is 'get' or 'set'.

-Handle<String> Parser::ParseIdentifierOrGetOrSet(bool* is_get,

- bool* is_set,

- bool* ok) {

- Handle<String> result = ParseIdentifier(ok);

+Handle<String> Parser::ParseIdentifierNameOrGetOrSet(bool* is_get,

+ bool* is_set,

+ bool* ok) {

+ Handle<String> result = ParseIdentifierName(ok);

if (!*ok) return Handle<String>();

if (scanner().is_literal_ascii() && scanner().literal_length() == 3) {

const char* token = scanner().literal_ascii_string().start();

« no previous file with comments | « src/parser.h ('k') | src/preparser.h » ('j') | no next file with comments »