Skip to content

Commit 2f5da9a

Browse files
jungshikCommit bot
jungshik
authored and
Commit bot
committed
Fix the uppercasing of U+00E7(ç) and U+00F7(÷)
Due to a typo in runtime-i18n.js, 'ç'(U+00E7) was not uppercased while '÷'(U+00F7) was incorrectly uppercased to '×'(U+00D7). Add a comprehensive test for Latin-1 supplemental block (U+00A0 ~ U+00FF). (they're special-cased for speed-up and needs to have a test for the range.). TEST=intl/general/case-mapping BUG=v8:5681 Review-Url: https://codereview.chromium.org/2533033003 Cr-Commit-Position: refs/heads/master@{#41331}
1 parent 60f18c7 commit 2f5da9a

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

‎src/runtime/runtime-i18n.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ inline uint16_t ToASCIIUpper(uint16_t ch) {
10201020
inline uint16_t ToLatin1Upper(uint16_t ch) {
10211021
DCHECK(ch != 0xDF && ch != 0xB5 && ch != 0xFF);
10221022
return ch &
1023-
~(((ch >= 'a' && ch <= 'z') || (((ch & 0xE0) == 0xE0) && ch != 0xE7))
1023+
~(((ch >= 'a' && ch <= 'z') || (((ch & 0xE0) == 0xE0) && ch != 0xF7))
10241024
<< 5);
10251025
}
10261026

‎test/intl/general/case-mapping.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,29 @@ assertEquals("\u{10CC0}", "\u{10C80}".toLocaleLowerCase());
138138
assertEquals("\u{10C80}", "\u{10CC0}".toLocaleUpperCase(["tr"]));
139139
assertEquals("\u{10C80}", "\u{10CC0}".toLocaleUpperCase(["tr"]));
140140
assertEquals("\u{10CC0}", "\u{10C80}".toLocaleLowerCase());
141+
142+
// check fast path for Latin-1 supplement (U+00A0 ~ U+00FF)
143+
var latin1Suppl = "\u00A0¡¢£¤¥¦§¨©ª«¬\u00AD®°±²³´µ¶·¸¹º»¼½¾¿" +
144+
"ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
145+
var latin1SupplLowercased = "\u00A0¡¢£¤¥¦§¨©ª«¬\u00AD®°±²³´µ¶·¸¹º»¼½¾¿" +
146+
"àáâãäåæçèéêëìíîïðñòóôõö×øùúûüýþßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
147+
var latin1SupplUppercased = "\u00A0¡¢£¤¥¦§¨©ª«¬\u00AD®°±²³´\u039C¶·¸¹º»¼½¾¿" +
148+
"ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞSSÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ÷ØÙÚÛÜÝÞ\u0178";
149+
150+
assertEquals(latin1SupplLowercased, latin1Suppl.toLowerCase());
151+
assertEquals(latin1SupplUppercased, latin1Suppl.toUpperCase());
152+
assertEquals(latin1SupplLowercased, latin1Suppl.toLocaleLowerCase("de"));
153+
assertEquals(latin1SupplUppercased, latin1Suppl.toLocaleUpperCase("de"));
154+
assertEquals(latin1SupplLowercased, latin1Suppl.toLocaleLowerCase("el"));
155+
assertEquals(latin1SupplUppercased, latin1Suppl.toLocaleUpperCase("el"));
156+
assertEquals(latin1SupplUppercased, latin1Suppl.toLocaleUpperCase("tr"));
157+
assertEquals(latin1SupplLowercased, latin1Suppl.toLocaleLowerCase("tr"));
158+
assertEquals(latin1SupplUppercased, latin1Suppl.toLocaleUpperCase("az"));
159+
assertEquals(latin1SupplLowercased, latin1Suppl.toLocaleLowerCase("az"));
160+
assertEquals(latin1SupplUppercased, latin1Suppl.toLocaleUpperCase("lt"));
161+
// Lithuanian need to have a dot-above for U+00CC(Ì) and U+00CD(Í) when
162+
// lowercasing.
163+
assertEquals("\u00A0¡¢£¤¥¦§¨©ª«¬\u00AD®°±²³´µ¶·¸¹º»¼½¾¿" +
164+
"àáâãäåæçèéêëi\u0307\u0300i\u0307\u0301îïðñòóôõö×øùúûüýþß" +
165+
"àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",
166+
latin1Suppl.toLocaleLowerCase("lt"));

0 commit comments

Comments
 (0)