OLD | NEW |
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 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1031 | 1031 |
1032 // Parse function body. | 1032 // Parse function body. |
1033 bool outer_is_script_scope = scope_->is_script_scope(); | 1033 bool outer_is_script_scope = scope_->is_script_scope(); |
1034 Scope* function_scope = NewScope(scope_, FUNCTION_SCOPE, kind); | 1034 Scope* function_scope = NewScope(scope_, FUNCTION_SCOPE, kind); |
1035 PreParserFactory factory(NULL); | 1035 PreParserFactory factory(NULL); |
1036 FunctionState function_state(&function_state_, &scope_, function_scope, kind, | 1036 FunctionState function_state(&function_state_, &scope_, function_scope, kind, |
1037 &factory); | 1037 &factory); |
1038 DuplicateFinder duplicate_finder(scanner()->unicode_cache()); | 1038 DuplicateFinder duplicate_finder(scanner()->unicode_cache()); |
1039 ExpressionClassifier formals_classifier(&duplicate_finder); | 1039 ExpressionClassifier formals_classifier(&duplicate_finder); |
1040 | 1040 |
1041 bool has_rest = false; | |
1042 Expect(Token::LPAREN, CHECK_OK); | 1041 Expect(Token::LPAREN, CHECK_OK); |
1043 int start_position = scanner()->location().beg_pos; | 1042 int start_position = scanner()->location().beg_pos; |
1044 function_scope->set_start_position(start_position); | 1043 function_scope->set_start_position(start_position); |
1045 int num_parameters = ParseFormalParameterList(nullptr, &has_rest, | 1044 PreParserFormalParameterParsingState parsing_state(nullptr); |
1046 &formals_classifier, CHECK_OK); | 1045 int num_parameters = |
| 1046 ParseFormalParameterList(&parsing_state, &formals_classifier, CHECK_OK); |
1047 Expect(Token::RPAREN, CHECK_OK); | 1047 Expect(Token::RPAREN, CHECK_OK); |
1048 int formals_end_position = scanner()->location().end_pos; | 1048 int formals_end_position = scanner()->location().end_pos; |
1049 | 1049 |
1050 CheckArityRestrictions(num_parameters, arity_restriction, has_rest, | 1050 CheckArityRestrictions(num_parameters, arity_restriction, |
1051 start_position, formals_end_position, CHECK_OK); | 1051 parsing_state.has_rest, start_position, |
| 1052 formals_end_position, CHECK_OK); |
1052 | 1053 |
1053 // See Parser::ParseFunctionLiteral for more information about lazy parsing | 1054 // See Parser::ParseFunctionLiteral for more information about lazy parsing |
1054 // and lazy compilation. | 1055 // and lazy compilation. |
1055 bool is_lazily_parsed = | 1056 bool is_lazily_parsed = |
1056 (outer_is_script_scope && allow_lazy() && !parenthesized_function_); | 1057 (outer_is_script_scope && allow_lazy() && !parenthesized_function_); |
1057 parenthesized_function_ = false; | 1058 parenthesized_function_ = false; |
1058 | 1059 |
1059 Expect(Token::LBRACE, CHECK_OK); | 1060 Expect(Token::LBRACE, CHECK_OK); |
1060 if (is_lazily_parsed) { | 1061 if (is_lazily_parsed) { |
1061 ParseLazyFunctionLiteralBody(CHECK_OK); | 1062 ParseLazyFunctionLiteralBody(CHECK_OK); |
1062 } else { | 1063 } else { |
1063 ParseStatementList(Token::RBRACE, CHECK_OK); | 1064 ParseStatementList(Token::RBRACE, CHECK_OK); |
1064 } | 1065 } |
1065 Expect(Token::RBRACE, CHECK_OK); | 1066 Expect(Token::RBRACE, CHECK_OK); |
1066 | 1067 |
1067 // Validate name and parameter names. We can do this only after parsing the | 1068 // Validate name and parameter names. We can do this only after parsing the |
1068 // function, since the function can declare itself strict. | 1069 // function, since the function can declare itself strict. |
1069 CheckFunctionName(language_mode(), kind, function_name, | 1070 CheckFunctionName(language_mode(), kind, function_name, |
1070 name_is_strict_reserved, function_name_location, CHECK_OK); | 1071 name_is_strict_reserved, function_name_location, CHECK_OK); |
1071 const bool strict_formal_parameters = has_rest || IsConciseMethod(kind); | 1072 const bool strict_formal_parameters = |
| 1073 !parsing_state.is_simple_parameter_list || IsConciseMethod(kind); |
1072 const bool allow_duplicate_parameters = | 1074 const bool allow_duplicate_parameters = |
1073 is_sloppy(language_mode()) && !strict_formal_parameters; | 1075 is_sloppy(language_mode()) && !strict_formal_parameters; |
1074 ValidateFormalParameters(&formals_classifier, language_mode(), | 1076 ValidateFormalParameters(&formals_classifier, language_mode(), |
1075 allow_duplicate_parameters, CHECK_OK); | 1077 allow_duplicate_parameters, CHECK_OK); |
1076 | 1078 |
1077 if (is_strict(language_mode())) { | 1079 if (is_strict(language_mode())) { |
1078 int end_position = scanner()->location().end_pos; | 1080 int end_position = scanner()->location().end_pos; |
1079 CheckStrictOctalLiteral(start_position, end_position, CHECK_OK); | 1081 CheckStrictOctalLiteral(start_position, end_position, CHECK_OK); |
1080 } | 1082 } |
1081 | 1083 |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1186 | 1188 |
1187 DCHECK(!spread_pos.IsValid()); | 1189 DCHECK(!spread_pos.IsValid()); |
1188 | 1190 |
1189 return Expression::Default(); | 1191 return Expression::Default(); |
1190 } | 1192 } |
1191 | 1193 |
1192 #undef CHECK_OK | 1194 #undef CHECK_OK |
1193 | 1195 |
1194 | 1196 |
1195 } } // v8::internal | 1197 } } // v8::internal |
OLD | NEW |