[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [260931] trunk/Source/JavaScriptCore
From: ross.kirsling () sony ! com
Date: 2020-04-30 3:00:35
Message-ID: 20200430030035.7FD6310051CE () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260931] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/260931">260931</a></dd> \
<dt>Author</dt> <dd>ross.kirsling@sony.com</dd> <dt>Date</dt> <dd>2020-04-29 20:00:35 \
-0700 (Wed, 29 Apr 2020)</dd> </dl>
<h3>Log Message</h3>
<pre>Ensure Intl classes don't have naming conflicts with unified builds
https://bugs.webkit.org/show_bug.cgi?id=211213
Reviewed by Yusuke Suzuki.
Each Intl class usually has an array named relevantExtensionsKeys and a function \
named localeData. This can result in redefinition errors when unified builds put two \
of them into the same translation unit. Some are already guarding against this with \
an internal namespace while others are not.
As a uniform approach, this patch makes each localeData function a static method and
puts each relevantExtensionsKeys array (as well as any constants for its indices) \
into an internal namespace.
Furthermore, since three different classes are defining an identical \
UFieldPositionIteratorDeleter, this patch consolidates them into one definition in \
IntlObject.
* runtime/IntlCollator.cpp:
(JSC::IntlCollator::sortLocaleData): Renamed from JSC::sortLocaleData.
(JSC::IntlCollator::searchLocaleData): Renamed from JSC::searchLocaleData.
(JSC::IntlCollator::initializeCollator):
* runtime/IntlCollator.h:
* runtime/IntlDateTimeFormat.cpp:
(JSC::IntlDateTimeFormat::localeData): Renamed from JSC::IntlDTFInternal::localeData.
(JSC::toDateTimeOptionsAnyDate): Renamed from \
JSC::IntlDTFInternal::toDateTimeOptionsAnyDate. \
(JSC::IntlDateTimeFormat::initializeDateTimeFormat): \
(JSC::UFieldPositionIteratorDeleter::operator() const): Deleted.
* runtime/IntlDateTimeFormat.h:
* runtime/IntlNumberFormat.cpp:
(JSC::IntlNumberFormat::localeData): Renamed from JSC::IntlNFInternal::localeData.
(JSC::IntlNumberFormat::initializeNumberFormat):
(JSC::UFieldPositionIteratorDeleter::operator() const): Deleted.
* runtime/IntlNumberFormat.h:
* runtime/IntlObject.cpp:
(JSC::UFieldPositionIteratorDeleter::operator() const): Added.
* runtime/IntlObject.h:
* runtime/IntlPluralRules.cpp:
(JSC::IntlPluralRules::localeData): Renamed from JSC::localeData.
* runtime/IntlPluralRules.h:
* runtime/IntlRelativeTimeFormat.cpp:
(JSC::IntlRelativeTimeFormat::localeData): Renamed from JSC::localeData.
(JSC::IntlRelativeTimeFormat::initializeRelativeTimeFormat):
(JSC::UFieldPositionIteratorDeleter::operator() const): Deleted.
* runtime/IntlRelativeTimeFormat.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorcpp">trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorh">trunk/Source/JavaScriptCore/runtime/IntlCollator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormath">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormath">trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlObjectcpp">trunk/Source/JavaScriptCore/runtime/IntlObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlObjecth">trunk/Source/JavaScriptCore/runtime/IntlObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlPluralRulescpp">trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlPluralRulesh">trunk/Source/JavaScriptCore/runtime/IntlPluralRules.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlRelativeTimeFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlRelativeTimeFormath">trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (260930 => \
260931)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2020-04-30 02:47:41 UTC \
(rev 260930)
+++ trunk/Source/JavaScriptCore/ChangeLog 2020-04-30 03:00:35 UTC (rev 260931)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2020-04-29 Ross Kirsling <ross.kirsling@sony.com>
</span><span class="cx">
</span><ins>+ Ensure Intl classes don't have naming conflicts with unified \
builds + https://bugs.webkit.org/show_bug.cgi?id=211213
+
+ Reviewed by Yusuke Suzuki.
+
+ Each Intl class usually has an array named relevantExtensionsKeys and a \
function named localeData. + This can result in redefinition errors when \
unified builds put two of them into the same translation unit. + Some are \
already guarding against this with an internal namespace while others are not. +
+ As a uniform approach, this patch makes each localeData function a static \
method and + puts each relevantExtensionsKeys array (as well as any constants \
for its indices) into an internal namespace. +
+ Furthermore, since three different classes are defining an identical \
UFieldPositionIteratorDeleter, + this patch consolidates them into one \
definition in IntlObject. +
+ * runtime/IntlCollator.cpp:
+ (JSC::IntlCollator::sortLocaleData): Renamed from JSC::sortLocaleData.
+ (JSC::IntlCollator::searchLocaleData): Renamed from JSC::searchLocaleData.
+ (JSC::IntlCollator::initializeCollator):
+ * runtime/IntlCollator.h:
+ * runtime/IntlDateTimeFormat.cpp:
+ (JSC::IntlDateTimeFormat::localeData): Renamed from \
JSC::IntlDTFInternal::localeData. + (JSC::toDateTimeOptionsAnyDate): Renamed \
from JSC::IntlDTFInternal::toDateTimeOptionsAnyDate. + \
(JSC::IntlDateTimeFormat::initializeDateTimeFormat): + \
(JSC::UFieldPositionIteratorDeleter::operator() const): Deleted. + * \
runtime/IntlDateTimeFormat.h: + * runtime/IntlNumberFormat.cpp:
+ (JSC::IntlNumberFormat::localeData): Renamed from \
JSC::IntlNFInternal::localeData. + \
(JSC::IntlNumberFormat::initializeNumberFormat): + \
(JSC::UFieldPositionIteratorDeleter::operator() const): Deleted. + * \
runtime/IntlNumberFormat.h: + * runtime/IntlObject.cpp:
+ (JSC::UFieldPositionIteratorDeleter::operator() const): Added.
+ * runtime/IntlObject.h:
+ * runtime/IntlPluralRules.cpp:
+ (JSC::IntlPluralRules::localeData): Renamed from JSC::localeData.
+ * runtime/IntlPluralRules.h:
+ * runtime/IntlRelativeTimeFormat.cpp:
+ (JSC::IntlRelativeTimeFormat::localeData): Renamed from JSC::localeData.
+ (JSC::IntlRelativeTimeFormat::initializeRelativeTimeFormat):
+ (JSC::UFieldPositionIteratorDeleter::operator() const): Deleted.
+ * runtime/IntlRelativeTimeFormat.h:
+
+2020-04-29 Ross Kirsling <ross.kirsling@sony.com>
+
</ins><span class="cx"> Unreviewed follow-up to r260848.
</span><span class="cx"> LowerDFGToB3 has its own isFunction which should NOT \
have been renamed. </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp 2020-04-30 03:00:35 UTC (rev \
260931) </span><span class="lines">@@ -43,10 +43,12 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo IntlCollator::s_info = { "Object", \
&Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(IntlCollator) }; \
</span><span class="cx"> </span><del>-static const char* const \
relevantCollatorExtensionKeys[3] = { "co", "kn", "kf" \
};
-static const size_t indexOfExtensionKeyCo = 0;
-static const size_t indexOfExtensionKeyKn = 1;
-static const size_t indexOfExtensionKeyKf = 2;
</del><ins>+namespace IntlCollatorInternal {
+constexpr const char* const relevantExtensionKeys[3] = { "co", \
"kn", "kf" }; +constexpr size_t collationIndex = 0;
+constexpr size_t numericIndex = 1;
+constexpr size_t caseFirstIndex = 2;
+}
</ins><span class="cx">
</span><span class="cx"> void IntlCollator::UCollatorDeleter::operator()(UCollator* \
collator) const </span><span class="cx"> {
</span><span class="lines">@@ -87,12 +89,12 @@
</span><span class="cx"> visitor.append(thisObject->m_boundCompare);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> sortLocaleData(const String& locale, \
size_t keyIndex) </del><ins>+Vector<String> IntlCollator::sortLocaleData(const \
String& locale, size_t keyIndex) </ins><span class="cx"> {
</span><span class="cx"> // 9.1 Internal slots of Service Constructors & \
10.2.3 Internal slots (ECMA-402 2.0) </span><span class="cx"> \
Vector<String> keyLocaleData; </span><span class="cx"> switch (keyIndex) {
</span><del>- case indexOfExtensionKeyCo: {
</del><ins>+ case IntlCollatorInternal::collationIndex: {
</ins><span class="cx"> // 10.2.3 "The first element of \
[[sortLocaleData]][locale].co and [[searchLocaleData]][locale].co must be null for \
all locale values." </span><span class="cx"> keyLocaleData.append({ });
</span><span class="cx">
</span><span class="lines">@@ -121,12 +123,12 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case indexOfExtensionKeyKn:
</del><ins>+ case IntlCollatorInternal::numericIndex:
</ins><span class="cx"> keyLocaleData.reserveInitialCapacity(2);
</span><span class="cx"> keyLocaleData.uncheckedAppend("false"_s);
</span><span class="cx"> keyLocaleData.uncheckedAppend("true"_s);
</span><span class="cx"> break;
</span><del>- case indexOfExtensionKeyKf:
</del><ins>+ case IntlCollatorInternal::caseFirstIndex:
</ins><span class="cx"> keyLocaleData.reserveInitialCapacity(3);
</span><span class="cx"> keyLocaleData.uncheckedAppend("false"_s);
</span><span class="cx"> keyLocaleData.uncheckedAppend("lower"_s);
</span><span class="lines">@@ -138,22 +140,22 @@
</span><span class="cx"> return keyLocaleData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> searchLocaleData(const String&, size_t \
keyIndex) </del><ins>+Vector<String> IntlCollator::searchLocaleData(const \
String&, size_t keyIndex) </ins><span class="cx"> {
</span><span class="cx"> // 9.1 Internal slots of Service Constructors & \
10.2.3 Internal slots (ECMA-402 2.0) </span><span class="cx"> \
Vector<String> keyLocaleData; </span><span class="cx"> switch (keyIndex) {
</span><del>- case indexOfExtensionKeyCo:
</del><ins>+ case IntlCollatorInternal::collationIndex:
</ins><span class="cx"> // 10.2.3 "The first element of \
[[sortLocaleData]][locale].co and [[searchLocaleData]][locale].co must be null for \
all locale values." </span><span class="cx"> \
keyLocaleData.reserveInitialCapacity(1); </span><span class="cx"> \
keyLocaleData.append({ }); </span><span class="cx"> break;
</span><del>- case indexOfExtensionKeyKn:
</del><ins>+ case IntlCollatorInternal::numericIndex:
</ins><span class="cx"> keyLocaleData.reserveInitialCapacity(2);
</span><span class="cx"> keyLocaleData.uncheckedAppend("false"_s);
</span><span class="cx"> keyLocaleData.uncheckedAppend("true"_s);
</span><span class="cx"> break;
</span><del>- case indexOfExtensionKeyKf:
</del><ins>+ case IntlCollatorInternal::caseFirstIndex:
</ins><span class="cx"> keyLocaleData.reserveInitialCapacity(3);
</span><span class="cx"> keyLocaleData.uncheckedAppend("false"_s);
</span><span class="cx"> keyLocaleData.uncheckedAppend("lower"_s);
</span><span class="lines">@@ -215,7 +217,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& availableLocales = \
intlCollatorAvailableLocales(); </span><del>- auto result = \
resolveLocale(globalObject, availableLocales, requestedLocales, opt, \
relevantCollatorExtensionKeys, WTF_ARRAY_LENGTH(relevantCollatorExtensionKeys), \
localeData); </del><ins>+ auto result = resolveLocale(globalObject, \
availableLocales, requestedLocales, opt, IntlCollatorInternal::relevantExtensionKeys, \
WTF_ARRAY_LENGTH(IntlCollatorInternal::relevantExtensionKeys), localeData); \
</ins><span class="cx"> </span><span class="cx"> m_locale = \
result.get("locale"_s); </span><span class="cx"> if \
(m_locale.isEmpty()) { </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlCollator.h \
(260930 => 260931)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlCollator.h 2020-04-30 \
02:47:41 UTC (rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollator.h 2020-04-30 03:00:35 UTC (rev \
260931) </span><span class="lines">@@ -67,6 +67,9 @@
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><ins>+ static Vector<String> sortLocaleData(const String&, \
size_t); + static Vector<String> searchLocaleData(const String&, \
size_t); +
</ins><span class="cx"> enum class Usage : uint8_t { Sort, Search };
</span><span class="cx"> enum class Sensitivity : uint8_t { Base, Accent, Case, \
Variant }; </span><span class="cx"> enum class CaseFirst : uint8_t { Upper, \
Lower, False }; </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp (260930 => 260931)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp 2020-04-30 02:47:41 UTC \
(rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp 2020-04-30 03:00:35 \
UTC (rev 260931) </span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include <unicode/ucal.h>
</span><span class="cx"> #include <unicode/udatpg.h>
</span><span class="cx"> #include <unicode/uenum.h>
</span><del>-#include <unicode/ufieldpositer.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/unicode/icu/ICUHelpers.h>
</span><span class="cx">
</span><span class="lines">@@ -47,22 +46,13 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo IntlDateTimeFormat::s_info = { \
"Object", &Base::s_info, nullptr, nullptr, \
CREATE_METHOD_TABLE(IntlDateTimeFormat) }; </span><span class="cx">
</span><del>-namespace IntlDTFInternal {
-static const char* const relevantExtensionKeys[3] = { "ca", \
"nu", "hc" }; </del><ins>+namespace IntlDateTimeFormatInternal {
+constexpr const char* relevantExtensionKeys[3] = { "ca", "nu", \
"hc" }; +constexpr size_t calendarIndex = 0;
+constexpr size_t numberingSystemIndex = 1;
+constexpr size_t hourCycleIndex = 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static const size_t indexOfExtensionKeyCa = 0;
-static const size_t indexOfExtensionKeyNu = 1;
-static const size_t indexOfExtensionKeyHc = 2;
-
-struct UFieldPositionIteratorDeleter {
- void operator()(UFieldPositionIterator* iterator) const
- {
- if (iterator)
- ufieldpositer_close(iterator);
- }
-};
-
</del><span class="cx"> void \
IntlDateTimeFormat::UDateFormatDeleter::operator()(UDateFormat* dateFormat) const \
</span><span class="cx"> { </span><span class="cx"> if (dateFormat)
</span><span class="lines">@@ -194,12 +184,11 @@
</span><span class="cx"> return canonical;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-namespace IntlDTFInternal {
-static Vector<String> localeData(const String& locale, size_t keyIndex)
</del><ins>+Vector<String> IntlDateTimeFormat::localeData(const String& \
locale, size_t keyIndex) </ins><span class="cx"> {
</span><span class="cx"> Vector<String> keyLocaleData;
</span><span class="cx"> switch (keyIndex) {
</span><del>- case indexOfExtensionKeyCa: {
</del><ins>+ case IntlDateTimeFormatInternal::calendarIndex: {
</ins><span class="cx"> UErrorCode status = U_ZERO_ERROR;
</span><span class="cx"> UEnumeration* calendars = \
ucal_getKeywordValuesForLocale("calendar", locale.utf8().data(), false, \
&status); </span><span class="cx"> ASSERT(U_SUCCESS(status));
</span><span class="lines">@@ -220,10 +209,10 @@
</span><span class="cx"> uenum_close(calendars);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case indexOfExtensionKeyNu:
</del><ins>+ case IntlDateTimeFormatInternal::numberingSystemIndex:
</ins><span class="cx"> keyLocaleData = numberingSystemsForLocale(locale);
</span><span class="cx"> break;
</span><del>- case indexOfExtensionKeyHc:
</del><ins>+ case IntlDateTimeFormatInternal::hourCycleIndex:
</ins><span class="cx"> // Null default so we know to use 'j' in pattern.
</span><span class="cx"> keyLocaleData.append(String());
</span><span class="cx"> keyLocaleData.append("h11"_s);
</span><span class="lines">@@ -333,7 +322,6 @@
</span><span class="cx"> // 9. Return options.
</span><span class="cx"> return options;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><span class="cx"> void IntlDateTimeFormat::setFormatsFromPattern(const \
StringView& pattern) </span><span class="cx"> {
</span><span class="lines">@@ -449,7 +437,7 @@
</span><span class="cx"> Vector<String> requestedLocales = \
canonicalizeLocaleList(globalObject, locales); </span><span class="cx"> \
RETURN_IF_EXCEPTION(scope, void()); </span><span class="cx">
</span><del>- JSObject* options = \
IntlDTFInternal::toDateTimeOptionsAnyDate(globalObject, originalOptions); \
</del><ins>+ JSObject* options = toDateTimeOptionsAnyDate(globalObject, \
originalOptions); </ins><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><span class="cx">
</span><span class="cx"> HashMap<String, String> opt;
</span><span class="lines">@@ -493,7 +481,7 @@
</span><span class="cx"> opt.add("hc"_s, String());
</span><span class="cx">
</span><span class="cx"> const HashSet<String>& availableLocales = \
intlDateTimeFormatAvailableLocales(); </span><del>- HashMap<String, String> \
resolved = resolveLocale(globalObject, availableLocales, requestedLocales, opt, \
IntlDTFInternal::relevantExtensionKeys, \
WTF_ARRAY_LENGTH(IntlDTFInternal::relevantExtensionKeys), \
IntlDTFInternal::localeData); </del><ins>+ HashMap<String, String> resolved \
= resolveLocale(globalObject, availableLocales, requestedLocales, opt, \
IntlDateTimeFormatInternal::relevantExtensionKeys, \
WTF_ARRAY_LENGTH(IntlDateTimeFormatInternal::relevantExtensionKeys), localeData); \
</ins><span class="cx"> </span><span class="cx"> m_locale = \
resolved.get(vm.propertyNames->locale.string()); </span><span class="cx"> if \
(m_locale.isEmpty()) { </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormath"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h 2020-04-30 03:00:35 UTC \
(rev 260931) </span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><ins>+ static Vector<String> localeData(const String&, size_t);
+
</ins><span class="cx"> enum class Weekday : uint8_t { None, Narrow, Short, Long \
}; </span><span class="cx"> enum class Era : uint8_t { None, Narrow, Short, Long \
}; </span><span class="cx"> enum class Year : uint8_t { None, TwoDigit, Numeric \
}; </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2020-04-30 03:00:35 UTC \
(rev 260931) </span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "ObjectConstructor.h"
</span><del>-#include <unicode/ufieldpositer.h>
</del><span class="cx"> #include <wtf/unicode/icu/ICUHelpers.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -43,16 +42,10 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo IntlNumberFormat::s_info = { \
"Object", &Base::s_info, nullptr, nullptr, \
CREATE_METHOD_TABLE(IntlNumberFormat) }; </span><span class="cx">
</span><del>-static const char* const relevantNumberExtensionKeys[1] = { \
"nu" }; </del><ins>+namespace IntlNumberFormatInternal {
+constexpr const char* relevantExtensionKeys[1] = { "nu" };
+}
</ins><span class="cx">
</span><del>-struct UFieldPositionIteratorDeleter {
- void operator()(UFieldPositionIterator* iterator) const
- {
- if (iterator)
- ufieldpositer_close(iterator);
- }
-};
-
</del><span class="cx"> struct IntlNumberFormatField {
</span><span class="cx"> int32_t type;
</span><span class="cx"> size_t size;
</span><span class="lines">@@ -97,14 +90,12 @@
</span><span class="cx"> visitor.append(thisObject->m_boundFormat);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-namespace IntlNFInternal {
-static Vector<String> localeData(const String& locale, size_t keyIndex)
</del><ins>+Vector<String> IntlNumberFormat::localeData(const String& \
locale, size_t keyIndex) </ins><span class="cx"> {
</span><span class="cx"> // 9.1 Internal slots of Service Constructors & \
11.2.3 Internal slots (ECMA-402 2.0) </span><span class="cx"> \
ASSERT_UNUSED(keyIndex, !keyIndex); // The index of the extension key "nu" \
in relevantExtensionKeys is 0. </span><span class="cx"> return \
numberingSystemsForLocale(locale); </span><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><span class="cx"> static inline unsigned computeCurrencySortKey(const \
String& currency) </span><span class="cx"> {
</span><span class="lines">@@ -198,7 +189,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& availableLocales = \
intlNumberFormatAvailableLocales(); </span><del>- auto result = \
resolveLocale(globalObject, availableLocales, requestedLocales, opt, \
relevantNumberExtensionKeys, WTF_ARRAY_LENGTH(relevantNumberExtensionKeys), \
IntlNFInternal::localeData); </del><ins>+ auto result = \
resolveLocale(globalObject, availableLocales, requestedLocales, opt, \
IntlNumberFormatInternal::relevantExtensionKeys, \
WTF_ARRAY_LENGTH(IntlNumberFormatInternal::relevantExtensionKeys), localeData); \
</ins><span class="cx"> </span><span class="cx"> m_locale = \
result.get("locale"_s); </span><span class="cx"> if \
(m_locale.isEmpty()) { </span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormath"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.h (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.h 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.h 2020-04-30 03:00:35 UTC \
(rev 260931) </span><span class="lines">@@ -71,6 +71,8 @@
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><ins>+ static Vector<String> localeData(const String&, size_t);
+
</ins><span class="cx"> enum class Style : uint8_t { Decimal, Percent, Currency \
}; </span><span class="cx"> enum class CurrencyDisplay : uint8_t { Code, Symbol, \
Name }; </span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlObject.cpp \
(260930 => 260931)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2020-04-30 \
02:47:41 UTC (rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2020-04-30 03:00:35 UTC (rev \
260931) </span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "ObjectPrototype.h"
</span><span class="cx"> #include "Options.h"
</span><span class="cx"> #include <unicode/ucol.h>
</span><ins>+#include <unicode/ufieldpositer.h>
</ins><span class="cx"> #include <unicode/uloc.h>
</span><span class="cx"> #include <unicode/unumsys.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="lines">@@ -114,6 +115,12 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo IntlObject::s_info = { "Object", \
&Base::s_info, &intlObjectTable, nullptr, CREATE_METHOD_TABLE(IntlObject) }; \
</span><span class="cx"> </span><ins>+void \
UFieldPositionIteratorDeleter::operator()(UFieldPositionIterator* iterator) const +{
+ if (iterator)
+ ufieldpositer_close(iterator);
+}
+
</ins><span class="cx"> IntlObject::IntlObject(VM& vm, Structure* structure)
</span><span class="cx"> : Base(vm, structure)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlObject.h \
(260930 => 260931)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlObject.h 2020-04-30 \
02:47:41 UTC (rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlObject.h 2020-04-30 03:00:35 UTC (rev \
260931) </span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx">
</span><ins>+struct UFieldPositionIterator;
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class IntlObject final : public JSNonFinalObject {
</span><span class="lines">@@ -75,4 +77,8 @@
</span><span class="cx">
</span><span class="cx"> bool isUnicodeLocaleIdentifierType(StringView);
</span><span class="cx">
</span><ins>+struct UFieldPositionIteratorDeleter {
+ void operator()(UFieldPositionIterator*) const;
+};
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlPluralRulescpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlPluralRules.cpp 2020-04-30 03:00:35 UTC \
(rev 260931) </span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> localeData(const String&, size_t)
</del><ins>+Vector<String> IntlPluralRules::localeData(const String&, \
size_t) </ins><span class="cx"> {
</span><span class="cx"> return { };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlPluralRulesh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlPluralRules.h (260930 => 260931)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlPluralRules.h 2020-04-30 02:47:41 UTC (rev \
260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlPluralRules.h 2020-04-30 03:00:35 UTC \
(rev 260931) </span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><ins>+ static Vector<String> localeData(const String&, size_t);
+
</ins><span class="cx"> struct UPluralRulesDeleter {
</span><span class="cx"> void operator()(UPluralRules*) const;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlRelativeTimeFormatcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp (260930 => \
260931)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp 2020-04-30 02:47:41 \
UTC (rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp 2020-04-30 \
03:00:35 UTC (rev 260931) </span><span class="lines">@@ -37,16 +37,10 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo IntlRelativeTimeFormat::s_info = { \
"Object", &Base::s_info, nullptr, nullptr, \
CREATE_METHOD_TABLE(IntlRelativeTimeFormat) }; </span><span class="cx">
</span><ins>+namespace IntlRelativeTimeFormatInternal {
</ins><span class="cx"> constexpr const char* relevantExtensionKeys[1] = { \
"nu" }; </span><ins>+}
</ins><span class="cx">
</span><del>-struct UFieldPositionIteratorDeleter {
- void operator()(UFieldPositionIterator* iterator) const
- {
- if (iterator)
- ufieldpositer_close(iterator);
- }
-};
-
</del><span class="cx"> void \
IntlRelativeTimeFormat::URelativeDateTimeFormatterDeleter::operator()(URelativeDateTimeFormatter* \
relativeDateTimeFormatter) const </span><span class="cx"> {
</span><span class="cx"> if (relativeDateTimeFormatter)
</span><span class="lines">@@ -90,7 +84,7 @@
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> localeData(const String& locale, size_t \
keyIndex) </del><ins>+Vector<String> IntlRelativeTimeFormat::localeData(const \
String& locale, size_t keyIndex) </ins><span class="cx"> {
</span><span class="cx"> // The index of the extension key "nu" in \
relevantExtensionKeys is 0. </span><span class="cx"> ASSERT_UNUSED(keyIndex, \
!keyIndex); </span><span class="lines">@@ -130,7 +124,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const HashSet<String>& availableLocales = \
intlRelativeTimeFormatAvailableLocales(); </span><del>- HashMap<String, \
String> resolved = resolveLocale(globalObject, availableLocales, requestedLocales, \
opt, relevantExtensionKeys, WTF_ARRAY_LENGTH(relevantExtensionKeys), localeData); \
</del><ins>+ HashMap<String, String> resolved = resolveLocale(globalObject, \
availableLocales, requestedLocales, opt, \
IntlRelativeTimeFormatInternal::relevantExtensionKeys, \
WTF_ARRAY_LENGTH(IntlRelativeTimeFormatInternal::relevantExtensionKeys), localeData); \
</ins><span class="cx"> m_locale = \
resolved.get(vm.propertyNames->locale.string()); </span><span class="cx"> if \
(m_locale.isEmpty()) { </span><span class="cx"> throwTypeError(globalObject, \
scope, "failed to initialize RelativeTimeFormat due to invalid locale"_s); \
</span></span></pre></div> <a \
id="trunkSourceJavaScriptCoreruntimeIntlRelativeTimeFormath"></a> <div \
class="modfile"><h4>Modified: \
trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.h (260930 => 260931)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.h 2020-04-30 02:47:41 UTC \
(rev 260930)
+++ trunk/Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.h 2020-04-30 03:00:35 \
UTC (rev 260931) </span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "JSObject.h"
</span><del>-#include <unicode/ufieldpositer.h>
</del><span class="cx"> #include <unicode/ureldatefmt.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -63,6 +62,8 @@
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><ins>+ static Vector<String> localeData(const String&, size_t);
+
</ins><span class="cx"> String formatInternal(JSGlobalObject*, double, StringView \
unit); </span><span class="cx">
</span><span class="cx"> struct URelativeDateTimeFormatterDeleter {
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic