[cleanup] Remove some leftover strong mode code from the parser

R=littledan@chromium.org

Review-Url: https://codereview.chromium.org/2172723003
Cr-Commit-Position: refs/heads/master@{#37958}
This commit is contained in:
adamk 2016-07-21 15:51:55 -07:00 committed by Commit bot
parent ccfd224ec3
commit 88707c98b4
3 changed files with 0 additions and 31 deletions

View File

@ -390,19 +390,6 @@ class ParserBase : public Traits {
void AddProperty() { expected_property_count_++; } void AddProperty() { expected_property_count_++; }
int expected_property_count() { return expected_property_count_; } int expected_property_count() { return expected_property_count_; }
Scanner::Location this_location() const { return this_location_; }
Scanner::Location super_location() const { return super_location_; }
Scanner::Location return_location() const { return return_location_; }
void set_this_location(Scanner::Location location) {
this_location_ = location;
}
void set_super_location(Scanner::Location location) {
super_location_ = location;
}
void set_return_location(Scanner::Location location) {
return_location_ = location;
}
bool is_generator() const { return IsGeneratorFunction(kind_); } bool is_generator() const { return IsGeneratorFunction(kind_); }
bool is_async_function() const { return IsAsyncFunction(kind_); } bool is_async_function() const { return IsAsyncFunction(kind_); }
bool is_resumable() const { return is_generator() || is_async_function(); } bool is_resumable() const { return is_generator() || is_async_function(); }
@ -487,15 +474,6 @@ class ParserBase : public Traits {
// Properties count estimation. // Properties count estimation.
int expected_property_count_; int expected_property_count_;
// Location of most recent use of 'this' (invalid if none).
Scanner::Location this_location_;
// Location of most recent 'return' statement (invalid if none).
Scanner::Location return_location_;
// Location of call to the "super" constructor (invalid if none).
Scanner::Location super_location_;
FunctionKind kind_; FunctionKind kind_;
// For generators, this variable may hold the generator object. It variable // For generators, this variable may hold the generator object. It variable
// is used by yield expressions and return statements. It is not necessary // is used by yield expressions and return statements. It is not necessary
@ -1252,9 +1230,6 @@ ParserBase<Traits>::FunctionState::FunctionState(
: ScopeState(scope_stack, scope), : ScopeState(scope_stack, scope),
next_materialized_literal_index_(0), next_materialized_literal_index_(0),
expected_property_count_(0), expected_property_count_(0),
this_location_(Scanner::Location::invalid()),
return_location_(Scanner::Location::invalid()),
super_location_(Scanner::Location::invalid()),
kind_(kind), kind_(kind),
generator_object_variable_(NULL), generator_object_variable_(NULL),
function_state_stack_(function_state_stack), function_state_stack_(function_state_stack),
@ -3101,7 +3076,6 @@ ParserBase<Traits>::ParseSuperExpression(bool is_new,
if (!is_new && peek() == Token::LPAREN && IsSubclassConstructor(kind)) { if (!is_new && peek() == Token::LPAREN && IsSubclassConstructor(kind)) {
// TODO(rossberg): This might not be the correct FunctionState for the // TODO(rossberg): This might not be the correct FunctionState for the
// method here. // method here.
function_state_->set_super_location(scanner()->location());
return this->NewSuperCallReference(this->scope(), factory(), pos); return this->NewSuperCallReference(this->scope(), factory(), pos);
} }
} }
@ -3375,7 +3349,6 @@ ParserBase<Traits>::ParseArrowFunctionLiteral(
int num_parameters = formal_parameters.scope->num_parameters(); int num_parameters = formal_parameters.scope->num_parameters();
int materialized_literal_count = -1; int materialized_literal_count = -1;
int expected_property_count = -1; int expected_property_count = -1;
Scanner::Location super_loc;
FunctionKind arrow_kind = is_async ? kAsyncArrowFunction : kArrowFunction; FunctionKind arrow_kind = is_async ? kAsyncArrowFunction : kArrowFunction;
{ {
@ -3439,7 +3412,6 @@ ParserBase<Traits>::ParseArrowFunctionLiteral(
expected_property_count = function_state.expected_property_count(); expected_property_count = function_state.expected_property_count();
this->MarkCollectedTailCallExpressions(); this->MarkCollectedTailCallExpressions();
} }
super_loc = function_state.super_location();
formal_parameters.scope->set_end_position(scanner()->location().end_pos); formal_parameters.scope->set_end_position(scanner()->location().end_pos);
@ -3471,7 +3443,6 @@ ParserBase<Traits>::ParseArrowFunctionLiteral(
function_literal->set_function_token_position( function_literal->set_function_token_position(
formal_parameters.scope->start_position()); formal_parameters.scope->start_position());
if (super_loc.IsValid()) function_state_->set_super_location(super_loc);
if (fni_ != NULL) this->InferFunctionName(fni_, function_literal); if (fni_ != NULL) this->InferFunctionName(fni_, function_literal);

View File

@ -2721,7 +2721,6 @@ Statement* Parser::ParseReturnStatement(bool* ok) {
// reported (underlining). // reported (underlining).
Expect(Token::RETURN, CHECK_OK); Expect(Token::RETURN, CHECK_OK);
Scanner::Location loc = scanner()->location(); Scanner::Location loc = scanner()->location();
function_state_->set_return_location(loc);
Token::Value tok = peek(); Token::Value tok = peek();
Statement* result; Statement* result;

View File

@ -748,7 +748,6 @@ PreParser::Statement PreParser::ParseReturnStatement(bool* ok) {
// reporting any errors on it, because of the way errors are // reporting any errors on it, because of the way errors are
// reported (underlining). // reported (underlining).
Expect(Token::RETURN, CHECK_OK); Expect(Token::RETURN, CHECK_OK);
function_state_->set_return_location(scanner()->location());
// An ECMAScript program is considered syntactically incorrect if it // An ECMAScript program is considered syntactically incorrect if it
// contains a return statement that is not within the body of a // contains a return statement that is not within the body of a