Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: src/preparser.cc

Issue 1170153003: [destructuring] Refactor duplicate parameter name detection. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <cmath> 5 #include <cmath>
6 6
7 #include "src/allocation.h" 7 #include "src/allocation.h"
8 #include "src/base/logging.h" 8 #include "src/base/logging.h"
9 #include "src/conversions-inl.h" 9 #include "src/conversions-inl.h"
10 #include "src/conversions.h" 10 #include "src/conversions.h"
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 FunctionLiteral::ArityRestriction arity_restriction, bool* ok) { 1025 FunctionLiteral::ArityRestriction arity_restriction, bool* ok) {
1026 // Function :: 1026 // Function ::
1027 // '(' FormalParameterList? ')' '{' FunctionBody '}' 1027 // '(' FormalParameterList? ')' '{' FunctionBody '}'
1028 1028
1029 // Parse function body. 1029 // Parse function body.
1030 bool outer_is_script_scope = scope_->is_script_scope(); 1030 bool outer_is_script_scope = scope_->is_script_scope();
1031 Scope* function_scope = NewScope(scope_, FUNCTION_SCOPE, kind); 1031 Scope* function_scope = NewScope(scope_, FUNCTION_SCOPE, kind);
1032 PreParserFactory factory(NULL); 1032 PreParserFactory factory(NULL);
1033 FunctionState function_state(&function_state_, &scope_, function_scope, kind, 1033 FunctionState function_state(&function_state_, &scope_, function_scope, kind,
1034 &factory); 1034 &factory);
1035 ExpressionClassifier formals_classifier; 1035 DuplicateFinder duplicate_finder(scanner()->unicode_cache());
1036 ExpressionClassifier formals_classifier(&duplicate_finder);
1036 1037
1037 bool has_rest = false; 1038 bool has_rest = false;
1038 Expect(Token::LPAREN, CHECK_OK); 1039 Expect(Token::LPAREN, CHECK_OK);
1039 int start_position = scanner()->location().beg_pos; 1040 int start_position = scanner()->location().beg_pos;
1040 function_scope->set_start_position(start_position); 1041 function_scope->set_start_position(start_position);
1041 int num_parameters; 1042 int num_parameters = ParseFormalParameterList(nullptr, &has_rest,
1042 { 1043 &formals_classifier, CHECK_OK);
1043 DuplicateFinder duplicate_finder(scanner()->unicode_cache());
1044 num_parameters = ParseFormalParameterList(&duplicate_finder, &has_rest,
1045 &formals_classifier, CHECK_OK);
1046 }
1047 Expect(Token::RPAREN, CHECK_OK); 1044 Expect(Token::RPAREN, CHECK_OK);
1048 int formals_end_position = scanner()->location().end_pos; 1045 int formals_end_position = scanner()->location().end_pos;
1049 1046
1050 CheckArityRestrictions(num_parameters, arity_restriction, has_rest, 1047 CheckArityRestrictions(num_parameters, arity_restriction, has_rest,
1051 start_position, formals_end_position, CHECK_OK); 1048 start_position, formals_end_position, CHECK_OK);
1052 1049
1053 // See Parser::ParseFunctionLiteral for more information about lazy parsing 1050 // See Parser::ParseFunctionLiteral for more information about lazy parsing
1054 // and lazy compilation. 1051 // and lazy compilation.
1055 bool is_lazily_parsed = 1052 bool is_lazily_parsed =
1056 (outer_is_script_scope && allow_lazy() && !parenthesized_function_); 1053 (outer_is_script_scope && allow_lazy() && !parenthesized_function_);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 1183
1187 DCHECK(!spread_pos.IsValid()); 1184 DCHECK(!spread_pos.IsValid());
1188 1185
1189 return Expression::Default(); 1186 return Expression::Default();
1190 } 1187 }
1191 1188
1192 #undef CHECK_OK 1189 #undef CHECK_OK
1193 1190
1194 1191
1195 } } // v8::internal 1192 } } // v8::internal
OLDNEW
« src/preparser.h ('K') | « src/preparser.h ('k') | tools/gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698