<!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>[214020] 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/214020">214020</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 16:40:24 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch back to ISO 4217 for Intl CurrencyDigits data
https://bugs.webkit.org/show_bug.cgi?id=169182
Previously, a patch switched Intl.NumberFormat to use CLDR data through
ICU to get the default number of decimal digits for a currency.
However, that change actually violated the ECMA 402 specification,
which references ISO 4217 as the data source. This patch reverts to
an in-line implementation of that data.
Patch by Daniel Ehrenberg <littledan@chromium.org> on 2017-03-15
Reviewed by Saam Barati.
* runtime/IntlNumberFormat.cpp:
(JSC::computeCurrencySortKey):
(JSC::extractCurrencySortKey):
(JSC::computeCurrencyDigits):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214019 => 214020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-15 23:29:17 UTC (rev 214019)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-15 23:40:24 UTC (rev 214020)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-15 Daniel Ehrenberg <littledan@chromium.org>
+
+ Switch back to ISO 4217 for Intl CurrencyDigits data
+ https://bugs.webkit.org/show_bug.cgi?id=169182
+
+ Previously, a patch switched Intl.NumberFormat to use CLDR data through
+ ICU to get the default number of decimal digits for a currency.
+ However, that change actually violated the ECMA 402 specification,
+ which references ISO 4217 as the data source. This patch reverts to
+ an in-line implementation of that data.
+
+ Reviewed by Saam Barati.
+
+ * runtime/IntlNumberFormat.cpp:
+ (JSC::computeCurrencySortKey):
+ (JSC::extractCurrencySortKey):
+ (JSC::computeCurrencyDigits):
+
</ins><span class="cx"> 2017-03-15 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: When we GC to try to get a fast memory, we should call collectAllGarbage(), not collectSync()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp (214019 => 214020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2017-03-15 23:29:17 UTC (rev 214019)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2017-03-15 23:40:24 UTC (rev 214020)
</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/ucurr.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -95,17 +94,62 @@
</span><span class="cx"> return numberingSystemsForLocale(locale);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline unsigned computeCurrencySortKey(const String& currency)
+{
+ ASSERT(currency.length() == 3);
+ ASSERT(currency.isAllSpecialCharacters<isASCIIUpper>());
+ return (currency[0] << 16) + (currency[1] << 8) + currency[2];
+}
+
+static inline unsigned computeCurrencySortKey(const char* currency)
+{
+ ASSERT(strlen(currency) == 3);
+ ASSERT(isAllSpecialCharacters<isASCIIUpper>(currency, 3));
+ return (currency[0] << 16) + (currency[1] << 8) + currency[2];
+}
+
+static unsigned extractCurrencySortKey(std::pair<const char*, unsigned>* currencyMinorUnit)
+{
+ return computeCurrencySortKey(currencyMinorUnit->first);
+}
+
</ins><span class="cx"> static unsigned computeCurrencyDigits(const String& currency)
</span><span class="cx"> {
</span><span class="cx"> // 11.1.1 The abstract operation CurrencyDigits (currency)
</span><span class="cx"> // "If the ISO 4217 currency and funds code list contains currency as an alphabetic code,
</span><span class="cx"> // then return the minor unit value corresponding to the currency from the list; else return 2.
</span><del>- Vector<UChar> chars = currency.charactersWithNullTermination();
- UErrorCode status = U_ZERO_ERROR;
- uint32_t result = ucurr_getDefaultFractionDigits(chars.data(), &status);
- if (U_FAILURE(status))
- result = 2;
- return result;
</del><ins>+ std::pair<const char*, unsigned> currencyMinorUnits[] = {
+ { "BHD", 3 },
+ { "BIF", 0 },
+ { "BYR", 0 },
+ { "CLF", 4 },
+ { "CLP", 0 },
+ { "DJF", 0 },
+ { "GNF", 0 },
+ { "IQD", 3 },
+ { "ISK", 0 },
+ { "JOD", 3 },
+ { "JPY", 0 },
+ { "KMF", 0 },
+ { "KRW", 0 },
+ { "KWD", 3 },
+ { "LYD", 3 },
+ { "OMR", 3 },
+ { "PYG", 0 },
+ { "RWF", 0 },
+ { "TND", 3 },
+ { "UGX", 0 },
+ { "UYI", 0 },
+ { "VND", 0 },
+ { "VUV", 0 },
+ { "XAF", 0 },
+ { "XOF", 0 },
+ { "XPF", 0 }
+ };
+ auto* currencyMinorUnit = tryBinarySearch<std::pair<const char*, unsigned>>(currencyMinorUnits, WTF_ARRAY_LENGTH(currencyMinorUnits), computeCurrencySortKey(currency), extractCurrencySortKey);
+ if (currencyMinorUnit)
+ return currencyMinorUnit->second;
+ return 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IntlNumberFormat::initializeNumberFormat(ExecState& state, JSValue locales, JSValue optionsValue)
</span></span></pre>
</div>
</div>
</body>
</html>