diff options
Diffstat (limited to 'deps/v8/src/pending-compilation-error-handler.cc')
| -rw-r--r-- | deps/v8/src/pending-compilation-error-handler.cc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/deps/v8/src/pending-compilation-error-handler.cc b/deps/v8/src/pending-compilation-error-handler.cc index 50e1403626..5119e06cc8 100644 --- a/deps/v8/src/pending-compilation-error-handler.cc +++ b/deps/v8/src/pending-compilation-error-handler.cc @@ -31,7 +31,7 @@ MessageLocation PendingCompilationErrorHandler::MessageDetails::GetLocation( } void PendingCompilationErrorHandler::ReportMessageAt( - int start_position, int end_position, MessageTemplate::Template message, + int start_position, int end_position, MessageTemplate message, const char* arg, ParseErrorType error_type) { if (has_pending_error_) return; has_pending_error_ = true; @@ -42,7 +42,7 @@ void PendingCompilationErrorHandler::ReportMessageAt( } void PendingCompilationErrorHandler::ReportMessageAt( - int start_position, int end_position, MessageTemplate::Template message, + int start_position, int end_position, MessageTemplate message, const AstRawString* arg, ParseErrorType error_type) { if (has_pending_error_) return; has_pending_error_ = true; @@ -52,9 +52,10 @@ void PendingCompilationErrorHandler::ReportMessageAt( error_type_ = error_type; } -void PendingCompilationErrorHandler::ReportWarningAt( - int start_position, int end_position, MessageTemplate::Template message, - const char* arg) { +void PendingCompilationErrorHandler::ReportWarningAt(int start_position, + int end_position, + MessageTemplate message, + const char* arg) { warning_messages_.emplace_front( MessageDetails(start_position, end_position, message, nullptr, arg)); } @@ -117,20 +118,20 @@ void PendingCompilationErrorHandler::ThrowPendingError(Isolate* isolate, Handle<JSObject> jserror = Handle<JSObject>::cast(error); Handle<Name> key_start_pos = factory->error_start_pos_symbol(); - JSObject::SetProperty(isolate, jserror, key_start_pos, - handle(Smi::FromInt(location.start_pos()), isolate), - LanguageMode::kSloppy) + Object::SetProperty(isolate, jserror, key_start_pos, + handle(Smi::FromInt(location.start_pos()), isolate), + LanguageMode::kSloppy) .Check(); Handle<Name> key_end_pos = factory->error_end_pos_symbol(); - JSObject::SetProperty(isolate, jserror, key_end_pos, - handle(Smi::FromInt(location.end_pos()), isolate), - LanguageMode::kSloppy) + Object::SetProperty(isolate, jserror, key_end_pos, + handle(Smi::FromInt(location.end_pos()), isolate), + LanguageMode::kSloppy) .Check(); Handle<Name> key_script = factory->error_script_symbol(); - JSObject::SetProperty(isolate, jserror, key_script, script, - LanguageMode::kSloppy) + Object::SetProperty(isolate, jserror, key_script, script, + LanguageMode::kSloppy) .Check(); isolate->Throw(*error, &location); @@ -138,8 +139,9 @@ void PendingCompilationErrorHandler::ThrowPendingError(Isolate* isolate, Handle<String> PendingCompilationErrorHandler::FormatErrorMessageForTest( Isolate* isolate) const { - return MessageTemplate::FormatMessage(isolate, error_details_.message(), - error_details_.ArgumentString(isolate)); + return MessageFormatter::FormatMessage( + isolate, error_details_.message(), + error_details_.ArgumentString(isolate)); } } // namespace internal |