Merge pull request #2 from bterlson/localeCompare-fix

15.5.4.9_CE should check for locale-sensitive comparison
This commit is contained in:
Brian Terlson 2014-07-10 14:59:57 -07:00
commit b0c6fb0272

View File

@ -1,5 +1,6 @@
// Copyright 2012 Norbert Lindenberg. All rights reserved. // Copyright 2012 Norbert Lindenberg. All rights reserved.
// Copyright 2012 Mozilla Corporation. All rights reserved. // Copyright 2012 Mozilla Corporation. All rights reserved.
// Copyright 2013 Microsoft Corporation. All rights reserved.
// This code is governed by the license found in the LICENSE file. // This code is governed by the license found in the LICENSE file.
/** /**
@ -46,12 +47,26 @@ var pairs = [
// ["\uD87E\uDC2B", "北"] // ["\uD87E\uDC2B", "北"]
]; ];
var i; // Detect whether we are using locale-sensitive comparisons or a bitwise comparison
for (i = 0; i < pairs.length; i++) { if("a".localeCompare("Z") < 0) {
var pair = pairs[i]; // We are using locale-sensitive comparison, so all pairs should be canonically equivalent
if (pair[0].localeCompare(pair[1]) !== 0) { var i;
$ERROR("String.prototype.localeCompare considers " + pair[0] + " (" + toU(pair[0]) + for (i = 0; i < pairs.length; i++) {
") ≠ " + pair[1] + " (" + toU(pair[1]) + ")."); var pair = pairs[i];
if (pair[0].localeCompare(pair[1]) !== 0) {
$ERROR("String.prototype.localeCompare considers " + pair[0] + " (" + toU(pair[0]) +
") ≠ " + pair[1] + " (" + toU(pair[1]) + ").");
}
}
} else {
// We are using bitwise comparison, so all pairs should not be equivalent
var i;
for (i = 0; i < pairs.length; i++) {
var pair = pairs[i];
if (pair[0].localeCompare(pair[1]) === 0) {
$ERROR("String.prototype.localeCompare considers " + pair[0] + " (" + toU(pair[0]) +
") = " + pair[1] + " (" + toU(pair[1]) + ").");
}
} }
} }
@ -65,4 +80,3 @@ function toU(s) {
} }
return result; return result;
} }