@@ -139,7 +139,7 @@ void Parser::GetUnexpectedTokenMessage(Token::Value token,
139139// ----------------------------------------------------------------------------
140140// The RETURN_IF_PARSE_ERROR macro is a convenient macro to enforce error
141141// handling for functions that may fail (by returning if there was an parser
142- // error scanner()->has_parser_error() ).
142+ // error).
143143//
144144// Usage:
145145// foo = ParseFoo(); // may fail
@@ -148,12 +148,11 @@ void Parser::GetUnexpectedTokenMessage(Token::Value token,
148148// SAFE_USE(foo);
149149
150150#define RETURN_IF_PARSE_ERROR_VALUE (x ) \
151- if (scanner()->has_parser_error ()) { \
152- return x; \
153- }
151+ if (has_error()) return x;
154152
155153#define RETURN_IF_PARSE_ERROR RETURN_IF_PARSE_ERROR_VALUE (nullptr )
156- #define RETURN_IF_PARSE_ERROR_VOID RETURN_IF_PARSE_ERROR_VALUE (this ->Void ())
154+ #define RETURN_IF_PARSE_ERROR_VOID \
155+ if (has_error()) return ;
157156
158157// ----------------------------------------------------------------------------
159158// Implementation of Parser
@@ -589,9 +588,8 @@ FunctionLiteral* Parser::DoParseProgram(Isolate* isolate, ParseInfo* info) {
589588 zone ());
590589
591590 ParseModuleItemList (body);
592- ok = !scanner_.has_parser_error () &&
593- module ()->Validate (this ->scope ()->AsModuleScope (),
594- pending_error_handler (), zone ());
591+ ok = !has_error () && module ()->Validate (this ->scope ()->AsModuleScope (),
592+ pending_error_handler (), zone ());
595593 } else if (info->is_wrapped_as_function ()) {
596594 ParseWrapped (isolate, info, body, scope, zone (), &ok);
597595 } else {
@@ -600,15 +598,15 @@ FunctionLiteral* Parser::DoParseProgram(Isolate* isolate, ParseInfo* info) {
600598 this ->scope ()->SetLanguageMode (info->language_mode ());
601599 ParseStatementList (body, Token::EOS);
602600 }
603- ok = ok && !scanner_. has_parser_error ();
601+ ok = ok && !has_error ();
604602
605603 // The parser will peek but not consume EOS. Our scope logically goes all
606604 // the way to the EOS, though.
607605 scope->set_end_position (scanner ()->peek_location ().beg_pos );
608606
609607 if (ok && is_strict (language_mode ())) {
610608 CheckStrictOctalLiteral (beg_pos, scanner ()->location ().end_pos );
611- ok = !scanner_. has_parser_error ();
609+ ok = !has_error ();
612610 }
613611 if (ok && is_sloppy (language_mode ())) {
614612 // TODO(littledan): Function bindings on the global object that modify
@@ -619,7 +617,7 @@ FunctionLiteral* Parser::DoParseProgram(Isolate* isolate, ParseInfo* info) {
619617 }
620618 if (ok) {
621619 CheckConflictingVarDeclarations (scope);
622- ok = !scanner_. has_parser_error ();
620+ ok = !has_error ();
623621 }
624622
625623 if (ok && info->parse_restriction () == ONLY_SINGLE_FUNCTION_LITERAL) {
@@ -815,12 +813,12 @@ FunctionLiteral* Parser::DoParseFunction(Isolate* isolate, ParseInfo* info,
815813 if (Check (Token::LPAREN)) {
816814 // '(' StrictFormalParameters ')'
817815 ParseFormalParameterList (&formals);
818- ok = !scanner_. has_parser_error ();
816+ ok = !has_error ();
819817 if (ok) ok = Check (Token::RPAREN);
820818 } else {
821819 // BindingIdentifier
822820 ParseFormalParameter (&formals);
823- ok = !scanner_. has_parser_error ();
821+ ok = !has_error ();
824822 if (ok) {
825823 DeclareFormalParameters (&formals);
826824 }
@@ -853,7 +851,7 @@ FunctionLiteral* Parser::DoParseFunction(Isolate* isolate, ParseInfo* info,
853851 const int rewritable_length = 0 ;
854852 Expression* expression =
855853 ParseArrowFunctionLiteral (accept_IN, formals, rewritable_length);
856- ok = !scanner_. has_parser_error ();
854+ ok = !has_error ();
857855 if (ok) {
858856 // Scanning must end at the same position that was recorded
859857 // previously. If not, parsing has been interrupted due to a stack
@@ -884,10 +882,10 @@ FunctionLiteral* Parser::DoParseFunction(Isolate* isolate, ParseInfo* info,
884882 raw_name, Scanner::Location::invalid (), kSkipFunctionNameCheck , kind,
885883 kNoSourcePosition , function_type, info->language_mode (),
886884 arguments_for_wrapped_function);
887- ok = !scanner_. has_parser_error ();
885+ ok = !has_error ();
888886 }
889887
890- DCHECK_EQ (ok, !scanner_. has_parser_error ());
888+ DCHECK_EQ (ok, !has_error ());
891889 if (ok) {
892890 result->set_requires_instance_fields_initializer (
893891 info->requires_instance_fields_initializer ());
@@ -1734,7 +1732,7 @@ void Parser::ParseAndRewriteGeneratorFunctionBody(
17341732 Expression* initial_yield = BuildInitialYield (pos, kind);
17351733 body->Add (factory ()->NewExpressionStatement (initial_yield, kNoSourcePosition ),
17361734 zone ());
1737- ParseStatementList (body, Token::RBRACE, !scanner ()-> has_parser_error ());
1735+ ParseStatementList (body, Token::RBRACE, !has_error ());
17381736}
17391737
17401738void Parser::ParseAndRewriteAsyncGeneratorFunctionBody (
@@ -1766,8 +1764,7 @@ void Parser::ParseAndRewriteAsyncGeneratorFunctionBody(
17661764 try_block->statements ()->Add (
17671765 factory ()->NewExpressionStatement (initial_yield, kNoSourcePosition ),
17681766 zone ());
1769- ParseStatementList (try_block->statements (), Token::RBRACE,
1770- !scanner ()->has_parser_error ());
1767+ ParseStatementList (try_block->statements (), Token::RBRACE, !has_error ());
17711768
17721769 // Don't create iterator result for async generators, as the resume methods
17731770 // will create it.
@@ -2779,7 +2776,7 @@ bool Parser::SkipFunction(
27792776 return false ;
27802777 } else if (pending_error_handler ()->has_pending_error ()) {
27812778 DCHECK (!pending_error_handler ()->stack_overflow ());
2782- DCHECK (scanner ()-> has_parser_error ());
2779+ DCHECK (has_error ());
27832780 } else {
27842781 DCHECK (!pending_error_handler ()->stack_overflow ());
27852782 set_allow_eval_cache (reusable_preparser ()->allow_eval_cache ());
@@ -2925,7 +2922,6 @@ Block* Parser::BuildParameterInitializationBlock(
29252922 param_scope = param_scope->FinalizeBlockScope ();
29262923 if (param_scope != nullptr ) {
29272924 CheckConflictingVarDeclarations (param_scope);
2928- RETURN_IF_PARSE_ERROR;
29292925 }
29302926 init_block->statements ()->Add (param_block, zone ());
29312927 }
@@ -3031,7 +3027,6 @@ ZonePtrList<Statement>* Parser::ParseFunction(
30313027 // For a regular function, the function arguments are parsed from source.
30323028 DCHECK_NULL (arguments_for_wrapped_function);
30333029 ParseFormalParameterList (&formals);
3034- RETURN_IF_PARSE_ERROR;
30353030 if (expected_parameters_end_pos != kNoSourcePosition ) {
30363031 // Check for '(' or ')' shenanigans in the parameter string for dynamic
30373032 // functions.
@@ -3048,14 +3043,12 @@ ZonePtrList<Statement>* Parser::ParseFunction(
30483043 }
30493044 }
30503045 Expect (Token::RPAREN);
3051- RETURN_IF_PARSE_ERROR;
30523046 int formals_end_position = scanner ()->location ().end_pos ;
30533047
30543048 CheckArityRestrictions (formals.arity , kind, formals.has_rest ,
30553049 function_scope->start_position (),
30563050 formals_end_position);
30573051 Expect (Token::LBRACE);
3058- RETURN_IF_PARSE_ERROR;
30593052 }
30603053 *num_parameters = formals.num_parameters ();
30613054 *function_length = formals.function_length ;
@@ -3609,6 +3602,7 @@ void Parser::QueueDestructuringAssignmentForRewriting(
36093602void Parser::SetFunctionNameFromPropertyName (LiteralProperty* property,
36103603 const AstRawString* name,
36113604 const AstRawString* prefix) {
3605+ if (has_error ()) return ;
36123606 // Ensure that the function we are going to create has shared name iff
36133607 // we are not going to set it later.
36143608 if (property->NeedsSetFunctionName ()) {
@@ -3634,7 +3628,7 @@ void Parser::SetFunctionNameFromPropertyName(ObjectLiteralProperty* property,
36343628 // Ignore "__proto__" as a name when it's being used to set the [[Prototype]]
36353629 // of an object literal.
36363630 // See ES #sec-__proto__-property-names-in-object-initializers.
3637- if (property->IsPrototype ()) return ;
3631+ if (property->IsPrototype () || has_error () ) return ;
36383632
36393633 DCHECK (!property->value ()->IsAnonymousFunctionDefinition () ||
36403634 property->kind () == ObjectLiteralProperty::COMPUTED);
@@ -3645,7 +3639,7 @@ void Parser::SetFunctionNameFromPropertyName(ObjectLiteralProperty* property,
36453639
36463640void Parser::SetFunctionNameFromIdentifierRef (Expression* value,
36473641 Expression* identifier) {
3648- if (!identifier->IsVariableProxy ()) return ;
3642+ if (has_error () || !identifier->IsVariableProxy ()) return ;
36493643 SetFunctionName (value, identifier->AsVariableProxy ()->raw_name ());
36503644}
36513645
0 commit comments