Reviewers: caitp, Michael Starzinger,
Description:
[es6] Fix and clean up recognition of simple parameter lists
Gets rid of IsSimpleParameterList predicate.
[email protected], [email protected]
BUG=
Please review this at https://codereview.chromium.org/1251603004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+11, -16 lines):
M src/parser.h
M src/parser.cc
Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index
bd5481d20ad3eedcfbc46f6c9fe842261f24a723..bf09b5be6b7e5f74bf5330f2ebff62f00921e791
100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -3883,7 +3883,13 @@ void
ParserTraits::ParseArrowFunctionFormalParameters(
DCHECK(!parameters->has_rest);
bool is_rest = expr->IsSpread();
- if (is_rest) expr = expr->AsSpread()->expression();
+ if (is_rest) {
+ expr = expr->AsSpread()->expression();
+ parameters->has_rest = true;
+ }
+ if (parameters->is_simple) {
+ parameters->is_simple = !is_rest && expr->IsVariableProxy();
+ }
if (expr->IsVariableProxy()) {
// When the formal parameter was originally seen, it was parsed as a
@@ -4299,18 +4305,9 @@ Statement* Parser::BuildAssertIsCoercible(Variable*
var) {
}
-bool Parser::IsSimpleParameterList(const ParserFormalParameters&
parameters) {
- for (auto parameter : parameters.params) {
- if (parameter.pattern != nullptr) return false;
- }
- if (parameters.has_rest) return false;
- return true;
-}
-
-
Block* Parser::BuildParameterInitializationBlock(
const ParserFormalParameters& parameters, bool* ok) {
- DCHECK(!IsSimpleParameterList(parameters));
+ DCHECK(!parameters.is_simple);
DCHECK(scope_->is_function_scope());
Block* init_block =
factory()->NewBlock(NULL, 1, true, RelocInfo::kNoPosition);
@@ -4341,7 +4338,6 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody(
const AstRawString* function_name, int pos,
const ParserFormalParameters& parameters, Variable* fvar,
Token::Value fvar_init_op, FunctionKind kind, bool* ok) {
- bool is_simple_parameter_list = IsSimpleParameterList(parameters);
// Everything inside an eagerly parsed function will be parsed eagerly
// (see comment above).
ParsingModeScope parsing_mode(this, PARSE_EAGERLY);
@@ -4367,7 +4363,7 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody(
ZoneList<Statement*>* body = result;
Scope* inner_scope = nullptr;
Block* inner_block = nullptr;
- if (!is_simple_parameter_list) {
+ if (!parameters.is_simple) {
inner_scope = NewScope(scope_, BLOCK_SCOPE);
inner_scope->set_is_declaration_scope();
inner_scope->set_start_position(scanner()->location().beg_pos);
@@ -4424,7 +4420,7 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody(
Expect(Token::RBRACE, CHECK_OK);
scope_->set_end_position(scanner()->location().end_pos);
- if (!is_simple_parameter_list) {
+ if (!parameters.is_simple) {
DCHECK_NOT_NULL(inner_scope);
DCHECK_EQ(body, inner_block->statements());
scope_->SetLanguageMode(inner_scope->language_mode());
Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index
b3e7d796ca1e0955e6557602bc7a0e30a77f3e4e..87269ed619581862cb4038173286a1c4b0d42b28
100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -1154,7 +1154,6 @@ class Parser : public ParserBase<ParserTraits> {
PreParser::PreParseResult ParseLazyFunctionBodyWithPreParser(
SingletonLogger* logger, Scanner::BookmarkScope* bookmark = nullptr);
- bool IsSimpleParameterList(const ParserFormalParameters& parameters);
Block* BuildParameterInitializationBlock(
const ParserFormalParameters& parameters, bool* ok);
@@ -1338,7 +1337,7 @@ void ParserTraits::DeclareFormalParameter(
void ParserTraits::AddParameterInitializationBlock(
const ParserFormalParameters& parameters,
ZoneList<v8::internal::Statement*>* body, bool* ok) {
- if (!parser_->IsSimpleParameterList(parameters)) {
+ if (!parameters.is_simple) {
auto* init_block =
parser_->BuildParameterInitializationBlock(parameters, ok);
if (!*ok) return;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
