diff options
| author | Michaël Zasso <targos@protonmail.com> | 2020-10-15 20:17:08 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2020-10-18 20:16:47 +0200 |
| commit | a1d639ba5de4ff34e34fb575fbb6cc1d41ec3cce (patch) | |
| tree | abc7d41c12f1495b1208fa4449cb2508c92c5e85 /deps/v8/src/objects/js-relative-time-format.cc | |
| parent | 089d654dd85f8e548597329f60a41d6029260caa (diff) | |
| download | node-new-a1d639ba5de4ff34e34fb575fbb6cc1d41ec3cce.tar.gz | |
deps: update V8 to 8.6.395
PR-URL: https://github.com/nodejs/node/pull/35415
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/v8/src/objects/js-relative-time-format.cc')
| -rw-r--r-- | deps/v8/src/objects/js-relative-time-format.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/deps/v8/src/objects/js-relative-time-format.cc b/deps/v8/src/objects/js-relative-time-format.cc index 0cb6b117df..267343aaae 100644 --- a/deps/v8/src/objects/js-relative-time-format.cc +++ b/deps/v8/src/objects/js-relative-time-format.cc @@ -18,8 +18,10 @@ #include "src/objects/js-number-format.h" #include "src/objects/js-relative-time-format-inl.h" #include "src/objects/objects-inl.h" +#include "unicode/decimfmt.h" #include "unicode/numfmt.h" #include "unicode/reldatefmt.h" +#include "unicode/unum.h" namespace v8 { namespace internal { @@ -129,7 +131,7 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( if (nu_extension_it != r.extensions.end() && nu_extension_it->second != numbering_system_str.get()) { icu_locale.setUnicodeKeywordValue("nu", nullptr, status); - CHECK(U_SUCCESS(status)); + DCHECK(U_SUCCESS(status)); } } // 12. Let locale be r.[[Locale]]. @@ -144,7 +146,7 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( if (numbering_system_str != nullptr && Intl::IsValidNumberingSystem(numbering_system_str.get())) { icu_locale.setUnicodeKeywordValue("nu", numbering_system_str.get(), status); - CHECK(U_SUCCESS(status)); + DCHECK(U_SUCCESS(status)); } // 15. Let dataLocale be r.[[DataLocale]]. @@ -182,7 +184,7 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( delete number_format; status = U_ZERO_ERROR; icu_locale.setUnicodeKeywordValue("nu", nullptr, status); - CHECK(U_SUCCESS(status)); + DCHECK(U_SUCCESS(status)); number_format = icu::NumberFormat::createInstance(icu_locale, UNUM_DECIMAL, status); } @@ -193,6 +195,10 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New( } } + icu::DecimalFormat* decimal_format = + static_cast<icu::DecimalFormat*>(number_format); + decimal_format->setMinimumGroupingDigits(-2); + // Change UDISPCTX_CAPITALIZATION_NONE to other values if // ECMA402 later include option to change capitalization. // Ref: https://github.com/tc39/proposal-intl-relative-time/issues/11 @@ -250,7 +256,7 @@ Handle<JSObject> JSRelativeTimeFormat::ResolvedOptions( Factory* factory = isolate->factory(); icu::RelativeDateTimeFormatter* formatter = format_holder->icu_formatter().raw(); - CHECK_NOT_NULL(formatter); + DCHECK_NOT_NULL(formatter); Handle<JSObject> result = factory->NewJSObject(isolate->object_function()); Handle<String> locale(format_holder->locale(), isolate); Handle<String> numberingSystem(format_holder->numberingSystem(), isolate); @@ -360,7 +366,7 @@ MaybeHandle<T> FormatCommon( T); } icu::RelativeDateTimeFormatter* formatter = format->icu_formatter().raw(); - CHECK_NOT_NULL(formatter); + DCHECK_NOT_NULL(formatter); URelativeDateTimeUnit unit_enum; if (!GetURelativeDateTimeUnit(unit, &unit_enum)) { THROW_NEW_ERROR( |