| Index: third_party/WebKit/Source/devtools/front_end/platform/utilities.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/platform/utilities.js b/third_party/WebKit/Source/devtools/front_end/platform/utilities.js
|
| index e441b543f8b7b5376f5b2a1706dbddcc7a587bb4..609d974a49c6c14d27db6253f61c7fa2a30de57a 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/platform/utilities.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/platform/utilities.js
|
| @@ -26,16 +26,14 @@
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
| -
|
| // FIXME: This performance optimization should be moved to blink so that all developers could enjoy it.
|
| // console is retrieved with V8Window.getAttribute method which is slow. Here we copy it to a js variable for faster access.
|
| console = console;
|
| console.__originalAssert = console.assert;
|
| -console.assert = function(value, message)
|
| -{
|
| - if (value)
|
| - return;
|
| - console.__originalAssert(value, message);
|
| +console.assert = function(value, message) {
|
| + if (value)
|
| + return;
|
| + console.__originalAssert(value, message);
|
| };
|
|
|
| /** @typedef {Array|NodeList|Arguments|{length: number}} */
|
| @@ -46,228 +44,212 @@ var ArrayLike;
|
| * @param {number} n
|
| * @return {number}
|
| */
|
| -function mod(m, n)
|
| -{
|
| - return ((m % n) + n) % n;
|
| +function mod(m, n) {
|
| + return ((m % n) + n) % n;
|
| }
|
|
|
| /**
|
| * @param {string} string
|
| * @return {!Array.<number>}
|
| */
|
| -String.prototype.findAll = function(string)
|
| -{
|
| - var matches = [];
|
| - var i = this.indexOf(string);
|
| - while (i !== -1) {
|
| - matches.push(i);
|
| - i = this.indexOf(string, i + string.length);
|
| - }
|
| - return matches;
|
| +String.prototype.findAll = function(string) {
|
| + var matches = [];
|
| + var i = this.indexOf(string);
|
| + while (i !== -1) {
|
| + matches.push(i);
|
| + i = this.indexOf(string, i + string.length);
|
| + }
|
| + return matches;
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.reverse = function()
|
| -{
|
| - return this.split("").reverse().join("");
|
| +String.prototype.reverse = function() {
|
| + return this.split('').reverse().join('');
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.replaceControlCharacters = function()
|
| -{
|
| - // Replace C0 and C1 control character sets with printable character.
|
| - // Do not replace '\t', \n' and '\r'.
|
| - return this.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u0080-\u009f]/g, "�");
|
| +String.prototype.replaceControlCharacters = function() {
|
| + // Replace C0 and C1 control character sets with printable character.
|
| + // Do not replace '\t', \n' and '\r'.
|
| + return this.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u0080-\u009f]/g, '�');
|
| };
|
|
|
| /**
|
| * @return {boolean}
|
| */
|
| -String.prototype.isWhitespace = function()
|
| -{
|
| - return /^\s*$/.test(this);
|
| +String.prototype.isWhitespace = function() {
|
| + return /^\s*$/.test(this);
|
| };
|
|
|
| /**
|
| * @return {!Array.<number>}
|
| */
|
| -String.prototype.computeLineEndings = function()
|
| -{
|
| - var endings = this.findAll("\n");
|
| - endings.push(this.length);
|
| - return endings;
|
| +String.prototype.computeLineEndings = function() {
|
| + var endings = this.findAll('\n');
|
| + endings.push(this.length);
|
| + return endings;
|
| };
|
|
|
| /**
|
| * @param {string} chars
|
| * @return {string}
|
| */
|
| -String.prototype.escapeCharacters = function(chars)
|
| -{
|
| - var foundChar = false;
|
| - for (var i = 0; i < chars.length; ++i) {
|
| - if (this.indexOf(chars.charAt(i)) !== -1) {
|
| - foundChar = true;
|
| - break;
|
| - }
|
| +String.prototype.escapeCharacters = function(chars) {
|
| + var foundChar = false;
|
| + for (var i = 0; i < chars.length; ++i) {
|
| + if (this.indexOf(chars.charAt(i)) !== -1) {
|
| + foundChar = true;
|
| + break;
|
| }
|
| + }
|
|
|
| - if (!foundChar)
|
| - return String(this);
|
| + if (!foundChar)
|
| + return String(this);
|
|
|
| - var result = "";
|
| - for (var i = 0; i < this.length; ++i) {
|
| - if (chars.indexOf(this.charAt(i)) !== -1)
|
| - result += "\\";
|
| - result += this.charAt(i);
|
| - }
|
| + var result = '';
|
| + for (var i = 0; i < this.length; ++i) {
|
| + if (chars.indexOf(this.charAt(i)) !== -1)
|
| + result += '\\';
|
| + result += this.charAt(i);
|
| + }
|
|
|
| - return result;
|
| + return result;
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.regexSpecialCharacters = function()
|
| -{
|
| - return "^[]{}()\\.^$*+?|-,";
|
| +String.regexSpecialCharacters = function() {
|
| + return '^[]{}()\\.^$*+?|-,';
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.escapeForRegExp = function()
|
| -{
|
| - return this.escapeCharacters(String.regexSpecialCharacters());
|
| +String.prototype.escapeForRegExp = function() {
|
| + return this.escapeCharacters(String.regexSpecialCharacters());
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.escapeHTML = function()
|
| -{
|
| - return this.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">").replace(/"/g, """); // " doublequotes just for editor
|
| +String.prototype.escapeHTML = function() {
|
| + return this.replace(/&/g, '&')
|
| + .replace(/</g, '<')
|
| + .replace(/>/g, '>')
|
| + .replace(/"/g, '"'); // " doublequotes just for editor
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.unescapeHTML = function()
|
| -{
|
| - return this.replace(/</g, "<")
|
| - .replace(/>/g, ">")
|
| - .replace(/:/g, ":")
|
| - .replace(/"/g, "\"")
|
| - .replace(/</g, "<")
|
| - .replace(/>/g, ">")
|
| - .replace(/&/g, "&");
|
| +String.prototype.unescapeHTML = function() {
|
| + return this.replace(/</g, '<')
|
| + .replace(/>/g, '>')
|
| + .replace(/:/g, ':')
|
| + .replace(/"/g, '"')
|
| + .replace(/</g, '<')
|
| + .replace(/>/g, '>')
|
| + .replace(/&/g, '&');
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.collapseWhitespace = function()
|
| -{
|
| - return this.replace(/[\s\xA0]+/g, " ");
|
| +String.prototype.collapseWhitespace = function() {
|
| + return this.replace(/[\s\xA0]+/g, ' ');
|
| };
|
|
|
| /**
|
| * @param {number} maxLength
|
| * @return {string}
|
| */
|
| -String.prototype.trimMiddle = function(maxLength)
|
| -{
|
| - if (this.length <= maxLength)
|
| - return String(this);
|
| - var leftHalf = maxLength >> 1;
|
| - var rightHalf = maxLength - leftHalf - 1;
|
| - return this.substr(0, leftHalf) + "\u2026" + this.substr(this.length - rightHalf, rightHalf);
|
| +String.prototype.trimMiddle = function(maxLength) {
|
| + if (this.length <= maxLength)
|
| + return String(this);
|
| + var leftHalf = maxLength >> 1;
|
| + var rightHalf = maxLength - leftHalf - 1;
|
| + return this.substr(0, leftHalf) + '\u2026' + this.substr(this.length - rightHalf, rightHalf);
|
| };
|
|
|
| /**
|
| * @param {number} maxLength
|
| * @return {string}
|
| */
|
| -String.prototype.trimEnd = function(maxLength)
|
| -{
|
| - if (this.length <= maxLength)
|
| - return String(this);
|
| - return this.substr(0, maxLength - 1) + "\u2026";
|
| +String.prototype.trimEnd = function(maxLength) {
|
| + if (this.length <= maxLength)
|
| + return String(this);
|
| + return this.substr(0, maxLength - 1) + '\u2026';
|
| };
|
|
|
| /**
|
| * @param {?string=} baseURLDomain
|
| * @return {string}
|
| */
|
| -String.prototype.trimURL = function(baseURLDomain)
|
| -{
|
| - var result = this.replace(/^(https|http|file):\/\//i, "");
|
| - if (baseURLDomain) {
|
| - if (result.toLowerCase().startsWith(baseURLDomain.toLowerCase()))
|
| - result = result.substr(baseURLDomain.length);
|
| - }
|
| - return result;
|
| +String.prototype.trimURL = function(baseURLDomain) {
|
| + var result = this.replace(/^(https|http|file):\/\//i, '');
|
| + if (baseURLDomain) {
|
| + if (result.toLowerCase().startsWith(baseURLDomain.toLowerCase()))
|
| + result = result.substr(baseURLDomain.length);
|
| + }
|
| + return result;
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.toTitleCase = function()
|
| -{
|
| - return this.substring(0, 1).toUpperCase() + this.substring(1);
|
| +String.prototype.toTitleCase = function() {
|
| + return this.substring(0, 1).toUpperCase() + this.substring(1);
|
| };
|
|
|
| /**
|
| * @param {string} other
|
| * @return {number}
|
| */
|
| -String.prototype.compareTo = function(other)
|
| -{
|
| - if (this > other)
|
| - return 1;
|
| - if (this < other)
|
| - return -1;
|
| - return 0;
|
| +String.prototype.compareTo = function(other) {
|
| + if (this > other)
|
| + return 1;
|
| + if (this < other)
|
| + return -1;
|
| + return 0;
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.removeURLFragment = function()
|
| -{
|
| - var fragmentIndex = this.indexOf("#");
|
| - if (fragmentIndex === -1)
|
| - fragmentIndex = this.length;
|
| - return this.substring(0, fragmentIndex);
|
| +String.prototype.removeURLFragment = function() {
|
| + var fragmentIndex = this.indexOf('#');
|
| + if (fragmentIndex === -1)
|
| + fragmentIndex = this.length;
|
| + return this.substring(0, fragmentIndex);
|
| };
|
|
|
| /**
|
| * @param {string|undefined} string
|
| * @return {number}
|
| */
|
| -String.hashCode = function(string)
|
| -{
|
| - if (!string)
|
| - return 0;
|
| - // Hash algorithm for substrings is described in "Über die Komplexität der Multiplikation in
|
| - // eingeschränkten Branchingprogrammmodellen" by Woelfe.
|
| - // http://opendatastructures.org/versions/edition-0.1d/ods-java/node33.html#SECTION00832000000000000000
|
| - var p = ((1 << 30) * 4 - 5); // prime: 2^32 - 5
|
| - var z = 0x5033d967; // 32 bits from random.org
|
| - var z2 = 0x59d2f15d; // random odd 32 bit number
|
| - var s = 0;
|
| - var zi = 1;
|
| - for (var i = 0; i < string.length; i++) {
|
| - var xi = string.charCodeAt(i) * z2;
|
| - s = (s + zi * xi) % p;
|
| - zi = (zi * z) % p;
|
| - }
|
| - s = (s + zi * (p - 1)) % p;
|
| - return Math.abs(s | 0);
|
| +String.hashCode = function(string) {
|
| + if (!string)
|
| + return 0;
|
| + // Hash algorithm for substrings is described in "Über die Komplexität der Multiplikation in
|
| + // eingeschränkten Branchingprogrammmodellen" by Woelfe.
|
| + // http://opendatastructures.org/versions/edition-0.1d/ods-java/node33.html#SECTION00832000000000000000
|
| + var p = ((1 << 30) * 4 - 5); // prime: 2^32 - 5
|
| + var z = 0x5033d967; // 32 bits from random.org
|
| + var z2 = 0x59d2f15d; // random odd 32 bit number
|
| + var s = 0;
|
| + var zi = 1;
|
| + for (var i = 0; i < string.length; i++) {
|
| + var xi = string.charCodeAt(i) * z2;
|
| + s = (s + zi * xi) % p;
|
| + zi = (zi * z) % p;
|
| + }
|
| + s = (s + zi * (p - 1)) % p;
|
| + return Math.abs(s | 0);
|
| };
|
|
|
| /**
|
| @@ -275,46 +257,44 @@ String.hashCode = function(string)
|
| * @param {number} index
|
| * @return {boolean}
|
| */
|
| -String.isDigitAt = function(string, index)
|
| -{
|
| - var c = string.charCodeAt(index);
|
| - return (48 <= c && c <= 57);
|
| +String.isDigitAt = function(string, index) {
|
| + var c = string.charCodeAt(index);
|
| + return (48 <= c && c <= 57);
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -String.prototype.toBase64 = function()
|
| -{
|
| - /**
|
| - * @param {number} b
|
| - * @return {number}
|
| - */
|
| - function encodeBits(b)
|
| - {
|
| - return b < 26 ? b + 65 : b < 52 ? b + 71 : b < 62 ? b - 4 : b === 62 ? 43 : b === 63 ? 47 : 65;
|
| - }
|
| - var encoder = new TextEncoder();
|
| - var data = encoder.encode(this.toString());
|
| - var n = data.length;
|
| - var encoded = "";
|
| - if (n === 0)
|
| - return encoded;
|
| - var shift;
|
| - var v = 0;
|
| - for (var i = 0; i < n; i++) {
|
| - shift = i % 3;
|
| - v |= data[i] << (16 >>> shift & 24);
|
| - if (shift === 2) {
|
| - encoded += String.fromCharCode(encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), encodeBits(v >>> 6 & 63), encodeBits(v & 63));
|
| - v = 0;
|
| - }
|
| - }
|
| - if (shift === 0)
|
| - encoded += String.fromCharCode(encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), 61, 61);
|
| - else if (shift === 1)
|
| - encoded += String.fromCharCode(encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), encodeBits(v >>> 6 & 63), 61);
|
| +String.prototype.toBase64 = function() {
|
| + /**
|
| + * @param {number} b
|
| + * @return {number}
|
| + */
|
| + function encodeBits(b) {
|
| + return b < 26 ? b + 65 : b < 52 ? b + 71 : b < 62 ? b - 4 : b === 62 ? 43 : b === 63 ? 47 : 65;
|
| + }
|
| + var encoder = new TextEncoder();
|
| + var data = encoder.encode(this.toString());
|
| + var n = data.length;
|
| + var encoded = '';
|
| + if (n === 0)
|
| return encoded;
|
| + var shift;
|
| + var v = 0;
|
| + for (var i = 0; i < n; i++) {
|
| + shift = i % 3;
|
| + v |= data[i] << (16 >>> shift & 24);
|
| + if (shift === 2) {
|
| + encoded += String.fromCharCode(
|
| + encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), encodeBits(v >>> 6 & 63), encodeBits(v & 63));
|
| + v = 0;
|
| + }
|
| + }
|
| + if (shift === 0)
|
| + encoded += String.fromCharCode(encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), 61, 61);
|
| + else if (shift === 1)
|
| + encoded += String.fromCharCode(encodeBits(v >>> 18 & 63), encodeBits(v >>> 12 & 63), encodeBits(v >>> 6 & 63), 61);
|
| + return encoded;
|
| };
|
|
|
| /**
|
| @@ -322,43 +302,42 @@ String.prototype.toBase64 = function()
|
| * @param {string} b
|
| * @return {number}
|
| */
|
| -String.naturalOrderComparator = function(a, b)
|
| -{
|
| - var chunk = /^\d+|^\D+/;
|
| - var chunka, chunkb, anum, bnum;
|
| - while (1) {
|
| - if (a) {
|
| - if (!b)
|
| - return 1;
|
| - } else {
|
| - if (b)
|
| - return -1;
|
| - else
|
| - return 0;
|
| - }
|
| - chunka = a.match(chunk)[0];
|
| - chunkb = b.match(chunk)[0];
|
| - anum = !isNaN(chunka);
|
| - bnum = !isNaN(chunkb);
|
| - if (anum && !bnum)
|
| - return -1;
|
| - if (bnum && !anum)
|
| - return 1;
|
| - if (anum && bnum) {
|
| - var diff = chunka - chunkb;
|
| - if (diff)
|
| - return diff;
|
| - if (chunka.length !== chunkb.length) {
|
| - if (!+chunka && !+chunkb) // chunks are strings of all 0s (special case)
|
| - return chunka.length - chunkb.length;
|
| - else
|
| - return chunkb.length - chunka.length;
|
| - }
|
| - } else if (chunka !== chunkb)
|
| - return (chunka < chunkb) ? -1 : 1;
|
| - a = a.substring(chunka.length);
|
| - b = b.substring(chunkb.length);
|
| +String.naturalOrderComparator = function(a, b) {
|
| + var chunk = /^\d+|^\D+/;
|
| + var chunka, chunkb, anum, bnum;
|
| + while (1) {
|
| + if (a) {
|
| + if (!b)
|
| + return 1;
|
| + } else {
|
| + if (b)
|
| + return -1;
|
| + else
|
| + return 0;
|
| }
|
| + chunka = a.match(chunk)[0];
|
| + chunkb = b.match(chunk)[0];
|
| + anum = !isNaN(chunka);
|
| + bnum = !isNaN(chunkb);
|
| + if (anum && !bnum)
|
| + return -1;
|
| + if (bnum && !anum)
|
| + return 1;
|
| + if (anum && bnum) {
|
| + var diff = chunka - chunkb;
|
| + if (diff)
|
| + return diff;
|
| + if (chunka.length !== chunkb.length) {
|
| + if (! + chunka && ! + chunkb) // chunks are strings of all 0s (special case)
|
| + return chunka.length - chunkb.length;
|
| + else
|
| + return chunkb.length - chunka.length;
|
| + }
|
| + } else if (chunka !== chunkb)
|
| + return (chunka < chunkb) ? -1 : 1;
|
| + a = a.substring(chunka.length);
|
| + b = b.substring(chunkb.length);
|
| + }
|
| };
|
|
|
| /**
|
| @@ -366,13 +345,12 @@ String.naturalOrderComparator = function(a, b)
|
| * @param {string} b
|
| * @return {number}
|
| */
|
| -String.caseInsensetiveComparator = function(a, b)
|
| -{
|
| - a = a.toUpperCase();
|
| - b = b.toUpperCase();
|
| - if (a === b)
|
| - return 0;
|
| - return a > b ? 1 : -1;
|
| +String.caseInsensetiveComparator = function(a, b) {
|
| + a = a.toUpperCase();
|
| + b = b.toUpperCase();
|
| + if (a === b)
|
| + return 0;
|
| + return a > b ? 1 : -1;
|
| };
|
|
|
| /**
|
| @@ -381,13 +359,12 @@ String.caseInsensetiveComparator = function(a, b)
|
| * @param {number} max
|
| * @return {number}
|
| */
|
| -Number.constrain = function(num, min, max)
|
| -{
|
| - if (num < min)
|
| - num = min;
|
| - else if (num > max)
|
| - num = max;
|
| - return num;
|
| +Number.constrain = function(num, min, max) {
|
| + if (num < min)
|
| + num = min;
|
| + else if (num > max)
|
| + num = max;
|
| + return num;
|
| };
|
|
|
| /**
|
| @@ -395,502 +372,457 @@ Number.constrain = function(num, min, max)
|
| * @param {number} b
|
| * @return {number}
|
| */
|
| -Number.gcd = function(a, b)
|
| -{
|
| - if (b === 0)
|
| - return a;
|
| - else
|
| - return Number.gcd(b, a % b);
|
| +Number.gcd = function(a, b) {
|
| + if (b === 0)
|
| + return a;
|
| + else
|
| + return Number.gcd(b, a % b);
|
| };
|
|
|
| /**
|
| * @param {string} value
|
| * @return {string}
|
| */
|
| -Number.toFixedIfFloating = function(value)
|
| -{
|
| - if (!value || isNaN(value))
|
| - return value;
|
| - var number = Number(value);
|
| - return number % 1 ? number.toFixed(3) : String(number);
|
| +Number.toFixedIfFloating = function(value) {
|
| + if (!value || isNaN(value))
|
| + return value;
|
| + var number = Number(value);
|
| + return number % 1 ? number.toFixed(3) : String(number);
|
| };
|
|
|
| /**
|
| * @return {boolean}
|
| */
|
| -Date.prototype.isValid = function()
|
| -{
|
| - return !isNaN(this.getTime());
|
| +Date.prototype.isValid = function() {
|
| + return !isNaN(this.getTime());
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -Date.prototype.toISO8601Compact = function()
|
| -{
|
| - /**
|
| - * @param {number} x
|
| - * @return {string}
|
| - */
|
| - function leadZero(x)
|
| - {
|
| - return (x > 9 ? "" : "0") + x;
|
| - }
|
| - return this.getFullYear() +
|
| - leadZero(this.getMonth() + 1) +
|
| - leadZero(this.getDate()) + "T" +
|
| - leadZero(this.getHours()) +
|
| - leadZero(this.getMinutes()) +
|
| - leadZero(this.getSeconds());
|
| +Date.prototype.toISO8601Compact = function() {
|
| + /**
|
| + * @param {number} x
|
| + * @return {string}
|
| + */
|
| + function leadZero(x) {
|
| + return (x > 9 ? '' : '0') + x;
|
| + }
|
| + return this.getFullYear() + leadZero(this.getMonth() + 1) + leadZero(this.getDate()) + 'T' +
|
| + leadZero(this.getHours()) + leadZero(this.getMinutes()) + leadZero(this.getSeconds());
|
| };
|
|
|
| /**
|
| * @return {string}
|
| */
|
| -Date.prototype.toConsoleTime = function()
|
| -{
|
| - /**
|
| - * @param {number} x
|
| - * @return {string}
|
| - */
|
| - function leadZero2(x)
|
| - {
|
| - return (x > 9 ? "" : "0") + x;
|
| - }
|
| -
|
| - /**
|
| - * @param {number} x
|
| - * @return {string}
|
| - */
|
| - function leadZero3(x)
|
| - {
|
| - return "0".repeat(3 - x.toString().length) + x;
|
| - }
|
| -
|
| - return this.getFullYear() + "-" +
|
| - leadZero2(this.getMonth() + 1) + "-" +
|
| - leadZero2(this.getDate()) + " " +
|
| - leadZero2(this.getHours()) + ":" +
|
| - leadZero2(this.getMinutes()) + ":" +
|
| - leadZero2(this.getSeconds()) + "." +
|
| - leadZero3(this.getMilliseconds());
|
| +Date.prototype.toConsoleTime = function() {
|
| + /**
|
| + * @param {number} x
|
| + * @return {string}
|
| + */
|
| + function leadZero2(x) {
|
| + return (x > 9 ? '' : '0') + x;
|
| + }
|
| +
|
| + /**
|
| + * @param {number} x
|
| + * @return {string}
|
| + */
|
| + function leadZero3(x) {
|
| + return '0'.repeat(3 - x.toString().length) + x;
|
| + }
|
| +
|
| + return this.getFullYear() + '-' + leadZero2(this.getMonth() + 1) + '-' + leadZero2(this.getDate()) + ' ' +
|
| + leadZero2(this.getHours()) + ':' + leadZero2(this.getMinutes()) + ':' + leadZero2(this.getSeconds()) + '.' +
|
| + leadZero3(this.getMilliseconds());
|
| };
|
|
|
| -Object.defineProperty(Array.prototype, "remove", {
|
| - /**
|
| - * @param {!T} value
|
| - * @param {boolean=} firstOnly
|
| - * @return {boolean}
|
| - * @this {Array.<!T>}
|
| - * @template T
|
| - */
|
| - value: function(value, firstOnly)
|
| - {
|
| - var index = this.indexOf(value);
|
| - if (index === -1)
|
| - return false;
|
| - if (firstOnly) {
|
| - this.splice(index, 1);
|
| - return true;
|
| - }
|
| - for (var i = index + 1, n = this.length; i < n; ++i) {
|
| - if (this[i] !== value)
|
| - this[index++] = this[i];
|
| - }
|
| - this.length = index;
|
| - return true;
|
| +Object.defineProperty(Array.prototype, 'remove', {
|
| + /**
|
| + * @param {!T} value
|
| + * @param {boolean=} firstOnly
|
| + * @return {boolean}
|
| + * @this {Array.<!T>}
|
| + * @template T
|
| + */
|
| + value: function(value, firstOnly) {
|
| + var index = this.indexOf(value);
|
| + if (index === -1)
|
| + return false;
|
| + if (firstOnly) {
|
| + this.splice(index, 1);
|
| + return true;
|
| + }
|
| + for (var i = index + 1, n = this.length; i < n; ++i) {
|
| + if (this[i] !== value)
|
| + this[index++] = this[i];
|
| }
|
| + this.length = index;
|
| + return true;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "pushAll", {
|
| - /**
|
| - * @param {!Array<!T>} array
|
| - * @this {Array<!T>}
|
| - * @template T
|
| - */
|
| - value: function(array)
|
| - {
|
| - for (var i = 0; i < array.length; ++i)
|
| - this.push(array[i]);
|
| - }
|
| +Object.defineProperty(Array.prototype, 'pushAll', {
|
| + /**
|
| + * @param {!Array<!T>} array
|
| + * @this {Array<!T>}
|
| + * @template T
|
| + */
|
| + value: function(array) {
|
| + for (var i = 0; i < array.length; ++i)
|
| + this.push(array[i]);
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "rotate", {
|
| - /**
|
| - * @param {number} index
|
| - * @return {!Array.<!T>}
|
| - * @this {Array.<!T>}
|
| - * @template T
|
| - */
|
| - value: function(index)
|
| - {
|
| - var result = [];
|
| - for (var i = index; i < index + this.length; ++i)
|
| - result.push(this[i % this.length]);
|
| - return result;
|
| - }
|
| +Object.defineProperty(Array.prototype, 'rotate', {
|
| + /**
|
| + * @param {number} index
|
| + * @return {!Array.<!T>}
|
| + * @this {Array.<!T>}
|
| + * @template T
|
| + */
|
| + value: function(index) {
|
| + var result = [];
|
| + for (var i = index; i < index + this.length; ++i)
|
| + result.push(this[i % this.length]);
|
| + return result;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "sortNumbers", {
|
| +Object.defineProperty(Array.prototype, 'sortNumbers', {
|
| + /**
|
| + * @this {Array.<number>}
|
| + */
|
| + value: function() {
|
| /**
|
| - * @this {Array.<number>}
|
| + * @param {number} a
|
| + * @param {number} b
|
| + * @return {number}
|
| */
|
| - value: function()
|
| - {
|
| - /**
|
| - * @param {number} a
|
| - * @param {number} b
|
| - * @return {number}
|
| - */
|
| - function numericComparator(a, b)
|
| - {
|
| - return a - b;
|
| - }
|
| -
|
| - this.sort(numericComparator);
|
| + function numericComparator(a, b) {
|
| + return a - b;
|
| }
|
| -});
|
|
|
| -Object.defineProperty(Uint32Array.prototype, "sort", {
|
| - value: Array.prototype.sort
|
| + this.sort(numericComparator);
|
| + }
|
| });
|
|
|
| -(function() {
|
| - var partition = {
|
| - /**
|
| - * @this {Array.<number>}
|
| - * @param {function(number, number): number} comparator
|
| - * @param {number} left
|
| - * @param {number} right
|
| - * @param {number} pivotIndex
|
| - */
|
| - value: function(comparator, left, right, pivotIndex)
|
| - {
|
| - function swap(array, i1, i2)
|
| - {
|
| - var temp = array[i1];
|
| - array[i1] = array[i2];
|
| - array[i2] = temp;
|
| - }
|
| -
|
| - var pivotValue = this[pivotIndex];
|
| - swap(this, right, pivotIndex);
|
| - var storeIndex = left;
|
| - for (var i = left; i < right; ++i) {
|
| - if (comparator(this[i], pivotValue) < 0) {
|
| - swap(this, storeIndex, i);
|
| - ++storeIndex;
|
| - }
|
| - }
|
| - swap(this, right, storeIndex);
|
| - return storeIndex;
|
| - }
|
| - };
|
| - Object.defineProperty(Array.prototype, "partition", partition);
|
| - Object.defineProperty(Uint32Array.prototype, "partition", partition);
|
| -
|
| - var sortRange = {
|
| - /**
|
| - * @param {function(number, number): number} comparator
|
| - * @param {number} leftBound
|
| - * @param {number} rightBound
|
| - * @param {number} sortWindowLeft
|
| - * @param {number} sortWindowRight
|
| - * @return {!Array.<number>}
|
| - * @this {Array.<number>}
|
| - */
|
| - value: function(comparator, leftBound, rightBound, sortWindowLeft, sortWindowRight)
|
| - {
|
| - function quickSortRange(array, comparator, left, right, sortWindowLeft, sortWindowRight)
|
| - {
|
| - if (right <= left)
|
| - return;
|
| - var pivotIndex = Math.floor(Math.random() * (right - left)) + left;
|
| - var pivotNewIndex = array.partition(comparator, left, right, pivotIndex);
|
| - if (sortWindowLeft < pivotNewIndex)
|
| - quickSortRange(array, comparator, left, pivotNewIndex - 1, sortWindowLeft, sortWindowRight);
|
| - if (pivotNewIndex < sortWindowRight)
|
| - quickSortRange(array, comparator, pivotNewIndex + 1, right, sortWindowLeft, sortWindowRight);
|
| - }
|
| - if (leftBound === 0 && rightBound === (this.length - 1) && sortWindowLeft === 0 && sortWindowRight >= rightBound)
|
| - this.sort(comparator);
|
| - else
|
| - quickSortRange(this, comparator, leftBound, rightBound, sortWindowLeft, sortWindowRight);
|
| - return this;
|
| - }
|
| - };
|
| - Object.defineProperty(Array.prototype, "sortRange", sortRange);
|
| - Object.defineProperty(Uint32Array.prototype, "sortRange", sortRange);
|
| -})();
|
| +Object.defineProperty(Uint32Array.prototype, 'sort', {value: Array.prototype.sort});
|
|
|
| -Object.defineProperty(Array.prototype, "stableSort", {
|
| +(function() {
|
| + var partition = {
|
| /**
|
| - * @param {function(?T, ?T): number=} comparator
|
| - * @return {!Array.<?T>}
|
| - * @this {Array.<?T>}
|
| - * @template T
|
| + * @this {Array.<number>}
|
| + * @param {function(number, number): number} comparator
|
| + * @param {number} left
|
| + * @param {number} right
|
| + * @param {number} pivotIndex
|
| */
|
| - value: function(comparator)
|
| - {
|
| - function defaultComparator(a, b)
|
| - {
|
| - return a < b ? -1 : (a > b ? 1 : 0);
|
| - }
|
| - comparator = comparator || defaultComparator;
|
| -
|
| - var indices = new Array(this.length);
|
| - for (var i = 0; i < this.length; ++i)
|
| - indices[i] = i;
|
| - var self = this;
|
| - /**
|
| - * @param {number} a
|
| - * @param {number} b
|
| - * @return {number}
|
| - */
|
| - function indexComparator(a, b)
|
| - {
|
| - var result = comparator(self[a], self[b]);
|
| - return result ? result : a - b;
|
| - }
|
| - indices.sort(indexComparator);
|
| -
|
| - for (var i = 0; i < this.length; ++i) {
|
| - if (indices[i] < 0 || i === indices[i])
|
| - continue;
|
| - var cyclical = i;
|
| - var saved = this[i];
|
| - while (true) {
|
| - var next = indices[cyclical];
|
| - indices[cyclical] = -1;
|
| - if (next === i) {
|
| - this[cyclical] = saved;
|
| - break;
|
| - } else {
|
| - this[cyclical] = this[next];
|
| - cyclical = next;
|
| - }
|
| - }
|
| + value: function(comparator, left, right, pivotIndex) {
|
| + function swap(array, i1, i2) {
|
| + var temp = array[i1];
|
| + array[i1] = array[i2];
|
| + array[i2] = temp;
|
| + }
|
| +
|
| + var pivotValue = this[pivotIndex];
|
| + swap(this, right, pivotIndex);
|
| + var storeIndex = left;
|
| + for (var i = left; i < right; ++i) {
|
| + if (comparator(this[i], pivotValue) < 0) {
|
| + swap(this, storeIndex, i);
|
| + ++storeIndex;
|
| }
|
| - return this;
|
| + }
|
| + swap(this, right, storeIndex);
|
| + return storeIndex;
|
| }
|
| -});
|
| + };
|
| + Object.defineProperty(Array.prototype, 'partition', partition);
|
| + Object.defineProperty(Uint32Array.prototype, 'partition', partition);
|
|
|
| -Object.defineProperty(Array.prototype, "qselect", {
|
| + var sortRange = {
|
| /**
|
| - * @param {number} k
|
| - * @param {function(number, number): number=} comparator
|
| - * @return {number|undefined}
|
| + * @param {function(number, number): number} comparator
|
| + * @param {number} leftBound
|
| + * @param {number} rightBound
|
| + * @param {number} sortWindowLeft
|
| + * @param {number} sortWindowRight
|
| + * @return {!Array.<number>}
|
| * @this {Array.<number>}
|
| */
|
| - value: function(k, comparator)
|
| - {
|
| - if (k < 0 || k >= this.length)
|
| - return;
|
| - if (!comparator)
|
| - comparator = function(a, b) { return a - b; };
|
| -
|
| - var low = 0;
|
| - var high = this.length - 1;
|
| - for (;;) {
|
| - var pivotPosition = this.partition(comparator, low, high, Math.floor((high + low) / 2));
|
| - if (pivotPosition === k)
|
| - return this[k];
|
| - else if (pivotPosition > k)
|
| - high = pivotPosition - 1;
|
| - else
|
| - low = pivotPosition + 1;
|
| - }
|
| + value: function(comparator, leftBound, rightBound, sortWindowLeft, sortWindowRight) {
|
| + function quickSortRange(array, comparator, left, right, sortWindowLeft, sortWindowRight) {
|
| + if (right <= left)
|
| + return;
|
| + var pivotIndex = Math.floor(Math.random() * (right - left)) + left;
|
| + var pivotNewIndex = array.partition(comparator, left, right, pivotIndex);
|
| + if (sortWindowLeft < pivotNewIndex)
|
| + quickSortRange(array, comparator, left, pivotNewIndex - 1, sortWindowLeft, sortWindowRight);
|
| + if (pivotNewIndex < sortWindowRight)
|
| + quickSortRange(array, comparator, pivotNewIndex + 1, right, sortWindowLeft, sortWindowRight);
|
| + }
|
| + if (leftBound === 0 && rightBound === (this.length - 1) && sortWindowLeft === 0 && sortWindowRight >= rightBound)
|
| + this.sort(comparator);
|
| + else
|
| + quickSortRange(this, comparator, leftBound, rightBound, sortWindowLeft, sortWindowRight);
|
| + return this;
|
| }
|
| -});
|
| + };
|
| + Object.defineProperty(Array.prototype, 'sortRange', sortRange);
|
| + Object.defineProperty(Uint32Array.prototype, 'sortRange', sortRange);
|
| +})();
|
| +
|
| +Object.defineProperty(Array.prototype, 'stableSort', {
|
| + /**
|
| + * @param {function(?T, ?T): number=} comparator
|
| + * @return {!Array.<?T>}
|
| + * @this {Array.<?T>}
|
| + * @template T
|
| + */
|
| + value: function(comparator) {
|
| + function defaultComparator(a, b) {
|
| + return a < b ? -1 : (a > b ? 1 : 0);
|
| + }
|
| + comparator = comparator || defaultComparator;
|
|
|
| -Object.defineProperty(Array.prototype, "lowerBound", {
|
| + var indices = new Array(this.length);
|
| + for (var i = 0; i < this.length; ++i)
|
| + indices[i] = i;
|
| + var self = this;
|
| /**
|
| - * Return index of the leftmost element that is equal or greater
|
| - * than the specimen object. If there's no such element (i.e. all
|
| - * elements are smaller than the specimen) returns right bound.
|
| - * The function works for sorted array.
|
| - * When specified, |left| (inclusive) and |right| (exclusive) indices
|
| - * define the search window.
|
| - *
|
| - * @param {!T} object
|
| - * @param {function(!T,!S):number=} comparator
|
| - * @param {number=} left
|
| - * @param {number=} right
|
| + * @param {number} a
|
| + * @param {number} b
|
| * @return {number}
|
| - * @this {Array.<!S>}
|
| - * @template T,S
|
| */
|
| - value: function(object, comparator, left, right)
|
| - {
|
| - function defaultComparator(a, b)
|
| - {
|
| - return a < b ? -1 : (a > b ? 1 : 0);
|
| - }
|
| - comparator = comparator || defaultComparator;
|
| - var l = left || 0;
|
| - var r = right !== undefined ? right : this.length;
|
| - while (l < r) {
|
| - var m = (l + r) >> 1;
|
| - if (comparator(object, this[m]) > 0)
|
| - l = m + 1;
|
| - else
|
| - r = m;
|
| + function indexComparator(a, b) {
|
| + var result = comparator(self[a], self[b]);
|
| + return result ? result : a - b;
|
| + }
|
| + indices.sort(indexComparator);
|
| +
|
| + for (var i = 0; i < this.length; ++i) {
|
| + if (indices[i] < 0 || i === indices[i])
|
| + continue;
|
| + var cyclical = i;
|
| + var saved = this[i];
|
| + while (true) {
|
| + var next = indices[cyclical];
|
| + indices[cyclical] = -1;
|
| + if (next === i) {
|
| + this[cyclical] = saved;
|
| + break;
|
| + } else {
|
| + this[cyclical] = this[next];
|
| + cyclical = next;
|
| }
|
| - return r;
|
| + }
|
| }
|
| + return this;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "upperBound", {
|
| - /**
|
| - * Return index of the leftmost element that is greater
|
| - * than the specimen object. If there's no such element (i.e. all
|
| - * elements are smaller or equal to the specimen) returns right bound.
|
| - * The function works for sorted array.
|
| - * When specified, |left| (inclusive) and |right| (exclusive) indices
|
| - * define the search window.
|
| - *
|
| - * @param {!T} object
|
| - * @param {function(!T,!S):number=} comparator
|
| - * @param {number=} left
|
| - * @param {number=} right
|
| - * @return {number}
|
| - * @this {Array.<!S>}
|
| - * @template T,S
|
| - */
|
| - value: function(object, comparator, left, right)
|
| - {
|
| - function defaultComparator(a, b)
|
| - {
|
| - return a < b ? -1 : (a > b ? 1 : 0);
|
| - }
|
| - comparator = comparator || defaultComparator;
|
| - var l = left || 0;
|
| - var r = right !== undefined ? right : this.length;
|
| - while (l < r) {
|
| - var m = (l + r) >> 1;
|
| - if (comparator(object, this[m]) >= 0)
|
| - l = m + 1;
|
| - else
|
| - r = m;
|
| - }
|
| - return r;
|
| +Object.defineProperty(Array.prototype, 'qselect', {
|
| + /**
|
| + * @param {number} k
|
| + * @param {function(number, number): number=} comparator
|
| + * @return {number|undefined}
|
| + * @this {Array.<number>}
|
| + */
|
| + value: function(k, comparator) {
|
| + if (k < 0 || k >= this.length)
|
| + return;
|
| + if (!comparator)
|
| + comparator = function(a, b) {
|
| + return a - b;
|
| + };
|
| +
|
| + var low = 0;
|
| + var high = this.length - 1;
|
| + for (;;) {
|
| + var pivotPosition = this.partition(comparator, low, high, Math.floor((high + low) / 2));
|
| + if (pivotPosition === k)
|
| + return this[k];
|
| + else if (pivotPosition > k)
|
| + high = pivotPosition - 1;
|
| + else
|
| + low = pivotPosition + 1;
|
| }
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Uint32Array.prototype, "lowerBound", {
|
| - value: Array.prototype.lowerBound
|
| +Object.defineProperty(Array.prototype, 'lowerBound', {
|
| + /**
|
| + * Return index of the leftmost element that is equal or greater
|
| + * than the specimen object. If there's no such element (i.e. all
|
| + * elements are smaller than the specimen) returns right bound.
|
| + * The function works for sorted array.
|
| + * When specified, |left| (inclusive) and |right| (exclusive) indices
|
| + * define the search window.
|
| + *
|
| + * @param {!T} object
|
| + * @param {function(!T,!S):number=} comparator
|
| + * @param {number=} left
|
| + * @param {number=} right
|
| + * @return {number}
|
| + * @this {Array.<!S>}
|
| + * @template T,S
|
| + */
|
| + value: function(object, comparator, left, right) {
|
| + function defaultComparator(a, b) {
|
| + return a < b ? -1 : (a > b ? 1 : 0);
|
| + }
|
| + comparator = comparator || defaultComparator;
|
| + var l = left || 0;
|
| + var r = right !== undefined ? right : this.length;
|
| + while (l < r) {
|
| + var m = (l + r) >> 1;
|
| + if (comparator(object, this[m]) > 0)
|
| + l = m + 1;
|
| + else
|
| + r = m;
|
| + }
|
| + return r;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Uint32Array.prototype, "upperBound", {
|
| - value: Array.prototype.upperBound
|
| +Object.defineProperty(Array.prototype, 'upperBound', {
|
| + /**
|
| + * Return index of the leftmost element that is greater
|
| + * than the specimen object. If there's no such element (i.e. all
|
| + * elements are smaller or equal to the specimen) returns right bound.
|
| + * The function works for sorted array.
|
| + * When specified, |left| (inclusive) and |right| (exclusive) indices
|
| + * define the search window.
|
| + *
|
| + * @param {!T} object
|
| + * @param {function(!T,!S):number=} comparator
|
| + * @param {number=} left
|
| + * @param {number=} right
|
| + * @return {number}
|
| + * @this {Array.<!S>}
|
| + * @template T,S
|
| + */
|
| + value: function(object, comparator, left, right) {
|
| + function defaultComparator(a, b) {
|
| + return a < b ? -1 : (a > b ? 1 : 0);
|
| + }
|
| + comparator = comparator || defaultComparator;
|
| + var l = left || 0;
|
| + var r = right !== undefined ? right : this.length;
|
| + while (l < r) {
|
| + var m = (l + r) >> 1;
|
| + if (comparator(object, this[m]) >= 0)
|
| + l = m + 1;
|
| + else
|
| + r = m;
|
| + }
|
| + return r;
|
| + }
|
| +});
|
| +
|
| +Object.defineProperty(Uint32Array.prototype, 'lowerBound', {value: Array.prototype.lowerBound});
|
| +
|
| +Object.defineProperty(Uint32Array.prototype, 'upperBound', {value: Array.prototype.upperBound});
|
| +
|
| +Object.defineProperty(Float64Array.prototype, 'lowerBound', {value: Array.prototype.lowerBound});
|
| +
|
| +Object.defineProperty(Array.prototype, 'binaryIndexOf', {
|
| + /**
|
| + * @param {!T} value
|
| + * @param {function(!T,!S):number} comparator
|
| + * @return {number}
|
| + * @this {Array.<!S>}
|
| + * @template T,S
|
| + */
|
| + value: function(value, comparator) {
|
| + var index = this.lowerBound(value, comparator);
|
| + return index < this.length && comparator(value, this[index]) === 0 ? index : -1;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Float64Array.prototype, "lowerBound", {
|
| - value: Array.prototype.lowerBound
|
| +Object.defineProperty(Array.prototype, 'select', {
|
| + /**
|
| + * @param {string} field
|
| + * @return {!Array.<!T>}
|
| + * @this {Array.<!Object.<string,!T>>}
|
| + * @template T
|
| + */
|
| + value: function(field) {
|
| + var result = new Array(this.length);
|
| + for (var i = 0; i < this.length; ++i)
|
| + result[i] = this[i][field];
|
| + return result;
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "binaryIndexOf", {
|
| - /**
|
| - * @param {!T} value
|
| - * @param {function(!T,!S):number} comparator
|
| - * @return {number}
|
| - * @this {Array.<!S>}
|
| - * @template T,S
|
| - */
|
| - value: function(value, comparator)
|
| - {
|
| - var index = this.lowerBound(value, comparator);
|
| - return index < this.length && comparator(value, this[index]) === 0 ? index : -1;
|
| - }
|
| +Object.defineProperty(Array.prototype, 'peekLast', {
|
| + /**
|
| + * @return {!T|undefined}
|
| + * @this {Array.<!T>}
|
| + * @template T
|
| + */
|
| + value: function() {
|
| + return this[this.length - 1];
|
| + }
|
| });
|
|
|
| -Object.defineProperty(Array.prototype, "select", {
|
| - /**
|
| - * @param {string} field
|
| - * @return {!Array.<!T>}
|
| - * @this {Array.<!Object.<string,!T>>}
|
| - * @template T
|
| - */
|
| - value: function(field)
|
| - {
|
| - var result = new Array(this.length);
|
| - for (var i = 0; i < this.length; ++i)
|
| - result[i] = this[i][field];
|
| - return result;
|
| +(function() {
|
| + /**
|
| + * @param {!Array.<T>} array1
|
| + * @param {!Array.<T>} array2
|
| + * @param {function(T,T):number} comparator
|
| + * @param {boolean} mergeNotIntersect
|
| + * @return {!Array.<T>}
|
| + * @template T
|
| + */
|
| + function mergeOrIntersect(array1, array2, comparator, mergeNotIntersect) {
|
| + var result = [];
|
| + var i = 0;
|
| + var j = 0;
|
| + while (i < array1.length && j < array2.length) {
|
| + var compareValue = comparator(array1[i], array2[j]);
|
| + if (mergeNotIntersect || !compareValue)
|
| + result.push(compareValue <= 0 ? array1[i] : array2[j]);
|
| + if (compareValue <= 0)
|
| + i++;
|
| + if (compareValue >= 0)
|
| + j++;
|
| }
|
| -});
|
| + if (mergeNotIntersect) {
|
| + while (i < array1.length)
|
| + result.push(array1[i++]);
|
| + while (j < array2.length)
|
| + result.push(array2[j++]);
|
| + }
|
| + return result;
|
| + }
|
|
|
| -Object.defineProperty(Array.prototype, "peekLast", {
|
| + Object.defineProperty(Array.prototype, 'intersectOrdered', {
|
| /**
|
| - * @return {!T|undefined}
|
| - * @this {Array.<!T>}
|
| + * @param {!Array.<T>} array
|
| + * @param {function(T,T):number} comparator
|
| + * @return {!Array.<T>}
|
| + * @this {!Array.<T>}
|
| * @template T
|
| */
|
| - value: function()
|
| - {
|
| - return this[this.length - 1];
|
| + value: function(array, comparator) {
|
| + return mergeOrIntersect(this, array, comparator, false);
|
| }
|
| -});
|
| + });
|
|
|
| -(function(){
|
| + Object.defineProperty(Array.prototype, 'mergeOrdered', {
|
| /**
|
| - * @param {!Array.<T>} array1
|
| - * @param {!Array.<T>} array2
|
| + * @param {!Array.<T>} array
|
| * @param {function(T,T):number} comparator
|
| - * @param {boolean} mergeNotIntersect
|
| * @return {!Array.<T>}
|
| + * @this {!Array.<T>}
|
| * @template T
|
| */
|
| - function mergeOrIntersect(array1, array2, comparator, mergeNotIntersect)
|
| - {
|
| - var result = [];
|
| - var i = 0;
|
| - var j = 0;
|
| - while (i < array1.length && j < array2.length) {
|
| - var compareValue = comparator(array1[i], array2[j]);
|
| - if (mergeNotIntersect || !compareValue)
|
| - result.push(compareValue <= 0 ? array1[i] : array2[j]);
|
| - if (compareValue <= 0)
|
| - i++;
|
| - if (compareValue >= 0)
|
| - j++;
|
| - }
|
| - if (mergeNotIntersect) {
|
| - while (i < array1.length)
|
| - result.push(array1[i++]);
|
| - while (j < array2.length)
|
| - result.push(array2[j++]);
|
| - }
|
| - return result;
|
| + value: function(array, comparator) {
|
| + return mergeOrIntersect(this, array, comparator, true);
|
| }
|
| -
|
| - Object.defineProperty(Array.prototype, "intersectOrdered", {
|
| - /**
|
| - * @param {!Array.<T>} array
|
| - * @param {function(T,T):number} comparator
|
| - * @return {!Array.<T>}
|
| - * @this {!Array.<T>}
|
| - * @template T
|
| - */
|
| - value: function(array, comparator)
|
| - {
|
| - return mergeOrIntersect(this, array, comparator, false);
|
| - }
|
| - });
|
| -
|
| - Object.defineProperty(Array.prototype, "mergeOrdered", {
|
| - /**
|
| - * @param {!Array.<T>} array
|
| - * @param {function(T,T):number} comparator
|
| - * @return {!Array.<T>}
|
| - * @this {!Array.<T>}
|
| - * @template T
|
| - */
|
| - value: function(array, comparator)
|
| - {
|
| - return mergeOrIntersect(this, array, comparator, true);
|
| - }
|
| - });
|
| + });
|
| })();
|
|
|
| /**
|
| @@ -898,9 +830,8 @@ Object.defineProperty(Array.prototype, "peekLast", {
|
| * @param {...*} var_arg
|
| * @return {string}
|
| */
|
| -String.sprintf = function(format, var_arg)
|
| -{
|
| - return String.vsprintf(format, Array.prototype.slice.call(arguments, 1));
|
| +String.sprintf = function(format, var_arg) {
|
| + return String.vsprintf(format, Array.prototype.slice.call(arguments, 1));
|
| };
|
|
|
| /**
|
| @@ -908,108 +839,102 @@ String.sprintf = function(format, var_arg)
|
| * @param {!Object.<string, function(string, ...):*>} formatters
|
| * @return {!Array.<!Object>}
|
| */
|
| -String.tokenizeFormatString = function(format, formatters)
|
| -{
|
| - var tokens = [];
|
| - var substitutionIndex = 0;
|
| -
|
| - function addStringToken(str)
|
| - {
|
| - if (tokens.length && tokens[tokens.length - 1].type === "string")
|
| - tokens[tokens.length - 1].value += str;
|
| - else
|
| - tokens.push({ type: "string", value: str });
|
| - }
|
| +String.tokenizeFormatString = function(format, formatters) {
|
| + var tokens = [];
|
| + var substitutionIndex = 0;
|
|
|
| - function addSpecifierToken(specifier, precision, substitutionIndex)
|
| - {
|
| - tokens.push({ type: "specifier", specifier: specifier, precision: precision, substitutionIndex: substitutionIndex });
|
| + function addStringToken(str) {
|
| + if (tokens.length && tokens[tokens.length - 1].type === 'string')
|
| + tokens[tokens.length - 1].value += str;
|
| + else
|
| + tokens.push({type: 'string', value: str});
|
| + }
|
| +
|
| + function addSpecifierToken(specifier, precision, substitutionIndex) {
|
| + tokens.push({type: 'specifier', specifier: specifier, precision: precision, substitutionIndex: substitutionIndex});
|
| + }
|
| +
|
| + var index = 0;
|
| + for (var precentIndex = format.indexOf('%', index); precentIndex !== -1; precentIndex = format.indexOf('%', index)) {
|
| + if (format.length === index) // unescaped % sign at the end of the format string.
|
| + break;
|
| + addStringToken(format.substring(index, precentIndex));
|
| + index = precentIndex + 1;
|
| +
|
| + if (format[index] === '%') {
|
| + // %% escape sequence.
|
| + addStringToken('%');
|
| + ++index;
|
| + continue;
|
| }
|
|
|
| - var index = 0;
|
| - for (var precentIndex = format.indexOf("%", index); precentIndex !== -1; precentIndex = format.indexOf("%", index)) {
|
| - if (format.length === index) // unescaped % sign at the end of the format string.
|
| - break;
|
| - addStringToken(format.substring(index, precentIndex));
|
| - index = precentIndex + 1;
|
| -
|
| - if (format[index] === "%") {
|
| - // %% escape sequence.
|
| - addStringToken("%");
|
| - ++index;
|
| - continue;
|
| - }
|
| -
|
| - if (String.isDigitAt(format, index)) {
|
| - // The first character is a number, it might be a substitution index.
|
| - var number = parseInt(format.substring(index), 10);
|
| - while (String.isDigitAt(format, index))
|
| - ++index;
|
| -
|
| - // If the number is greater than zero and ends with a "$",
|
| - // then this is a substitution index.
|
| - if (number > 0 && format[index] === "$") {
|
| - substitutionIndex = (number - 1);
|
| - ++index;
|
| - }
|
| - }
|
| -
|
| - var precision = -1;
|
| - if (format[index] === ".") {
|
| - // This is a precision specifier. If no digit follows the ".",
|
| - // then the precision should be zero.
|
| - ++index;
|
| - precision = parseInt(format.substring(index), 10);
|
| - if (isNaN(precision))
|
| - precision = 0;
|
| -
|
| - while (String.isDigitAt(format, index))
|
| - ++index;
|
| - }
|
| + if (String.isDigitAt(format, index)) {
|
| + // The first character is a number, it might be a substitution index.
|
| + var number = parseInt(format.substring(index), 10);
|
| + while (String.isDigitAt(format, index))
|
| + ++index;
|
|
|
| - if (!(format[index] in formatters)) {
|
| - addStringToken(format.substring(precentIndex, index + 1));
|
| - ++index;
|
| - continue;
|
| - }
|
| + // If the number is greater than zero and ends with a "$",
|
| + // then this is a substitution index.
|
| + if (number > 0 && format[index] === '$') {
|
| + substitutionIndex = (number - 1);
|
| + ++index;
|
| + }
|
| + }
|
|
|
| - addSpecifierToken(format[index], precision, substitutionIndex);
|
| + var precision = -1;
|
| + if (format[index] === '.') {
|
| + // This is a precision specifier. If no digit follows the ".",
|
| + // then the precision should be zero.
|
| + ++index;
|
| + precision = parseInt(format.substring(index), 10);
|
| + if (isNaN(precision))
|
| + precision = 0;
|
|
|
| - ++substitutionIndex;
|
| + while (String.isDigitAt(format, index))
|
| ++index;
|
| }
|
|
|
| - addStringToken(format.substring(index));
|
| + if (!(format[index] in formatters)) {
|
| + addStringToken(format.substring(precentIndex, index + 1));
|
| + ++index;
|
| + continue;
|
| + }
|
|
|
| - return tokens;
|
| -};
|
| + addSpecifierToken(format[index], precision, substitutionIndex);
|
|
|
| -String.standardFormatters = {
|
| - /**
|
| - * @return {number}
|
| - */
|
| - d: function(substitution)
|
| - {
|
| - return !isNaN(substitution) ? substitution : 0;
|
| - },
|
| + ++substitutionIndex;
|
| + ++index;
|
| + }
|
|
|
| - /**
|
| - * @return {number}
|
| - */
|
| - f: function(substitution, token)
|
| - {
|
| - if (substitution && token.precision > -1)
|
| - substitution = substitution.toFixed(token.precision);
|
| - return !isNaN(substitution) ? substitution : (token.precision > -1 ? Number(0).toFixed(token.precision) : 0);
|
| - },
|
| + addStringToken(format.substring(index));
|
|
|
| - /**
|
| - * @return {string}
|
| - */
|
| - s: function(substitution)
|
| - {
|
| - return substitution;
|
| - }
|
| + return tokens;
|
| +};
|
| +
|
| +String.standardFormatters = {
|
| + /**
|
| + * @return {number}
|
| + */
|
| + d: function(substitution) {
|
| + return !isNaN(substitution) ? substitution : 0;
|
| + },
|
| +
|
| + /**
|
| + * @return {number}
|
| + */
|
| + f: function(substitution, token) {
|
| + if (substitution && token.precision > -1)
|
| + substitution = substitution.toFixed(token.precision);
|
| + return !isNaN(substitution) ? substitution : (token.precision > -1 ? Number(0).toFixed(token.precision) : 0);
|
| + },
|
| +
|
| + /**
|
| + * @return {string}
|
| + */
|
| + s: function(substitution) {
|
| + return substitution;
|
| + }
|
| };
|
|
|
| /**
|
| @@ -1017,9 +942,14 @@ String.standardFormatters = {
|
| * @param {!Array.<*>} substitutions
|
| * @return {string}
|
| */
|
| -String.vsprintf = function(format, substitutions)
|
| -{
|
| - return String.format(format, substitutions, String.standardFormatters, "", function(a, b) { return a + b; }).formattedResult;
|
| +String.vsprintf = function(format, substitutions) {
|
| + return String
|
| + .format(
|
| + format, substitutions, String.standardFormatters, '',
|
| + function(a, b) {
|
| + return a + b;
|
| + })
|
| + .formattedResult;
|
| };
|
|
|
| /**
|
| @@ -1032,71 +962,69 @@ String.vsprintf = function(format, substitutions)
|
| * @return {!{formattedResult: T, unusedSubstitutions: ?ArrayLike}};
|
| * @template T, Q
|
| */
|
| -String.format = function(format, substitutions, formatters, initialValue, append, tokenizedFormat)
|
| -{
|
| - if (!format || !substitutions || !substitutions.length)
|
| - return { formattedResult: append(initialValue, format), unusedSubstitutions: substitutions };
|
| -
|
| - function prettyFunctionName()
|
| - {
|
| - return "String.format(\"" + format + "\", \"" + Array.prototype.join.call(substitutions, "\", \"") + "\")";
|
| - }
|
| +String.format = function(format, substitutions, formatters, initialValue, append, tokenizedFormat) {
|
| + if (!format || !substitutions || !substitutions.length)
|
| + return {formattedResult: append(initialValue, format), unusedSubstitutions: substitutions};
|
|
|
| - function warn(msg)
|
| - {
|
| - console.warn(prettyFunctionName() + ": " + msg);
|
| - }
|
| + function prettyFunctionName() {
|
| + return 'String.format("' + format + '", "' + Array.prototype.join.call(substitutions, '", "') + '")';
|
| + }
|
|
|
| - function error(msg)
|
| - {
|
| - console.error(prettyFunctionName() + ": " + msg);
|
| - }
|
| + function warn(msg) {
|
| + console.warn(prettyFunctionName() + ': ' + msg);
|
| + }
|
|
|
| - var result = initialValue;
|
| - var tokens = tokenizedFormat || String.tokenizeFormatString(format, formatters);
|
| - var usedSubstitutionIndexes = {};
|
| + function error(msg) {
|
| + console.error(prettyFunctionName() + ': ' + msg);
|
| + }
|
|
|
| - for (var i = 0; i < tokens.length; ++i) {
|
| - var token = tokens[i];
|
| + var result = initialValue;
|
| + var tokens = tokenizedFormat || String.tokenizeFormatString(format, formatters);
|
| + var usedSubstitutionIndexes = {};
|
|
|
| - if (token.type === "string") {
|
| - result = append(result, token.value);
|
| - continue;
|
| - }
|
| + for (var i = 0; i < tokens.length; ++i) {
|
| + var token = tokens[i];
|
|
|
| - if (token.type !== "specifier") {
|
| - error("Unknown token type \"" + token.type + "\" found.");
|
| - continue;
|
| - }
|
| + if (token.type === 'string') {
|
| + result = append(result, token.value);
|
| + continue;
|
| + }
|
|
|
| - if (token.substitutionIndex >= substitutions.length) {
|
| - // If there are not enough substitutions for the current substitutionIndex
|
| - // just output the format specifier literally and move on.
|
| - error("not enough substitution arguments. Had " + substitutions.length + " but needed " + (token.substitutionIndex + 1) + ", so substitution was skipped.");
|
| - result = append(result, "%" + (token.precision > -1 ? token.precision : "") + token.specifier);
|
| - continue;
|
| - }
|
| + if (token.type !== 'specifier') {
|
| + error('Unknown token type "' + token.type + '" found.');
|
| + continue;
|
| + }
|
|
|
| - usedSubstitutionIndexes[token.substitutionIndex] = true;
|
| + if (token.substitutionIndex >= substitutions.length) {
|
| + // If there are not enough substitutions for the current substitutionIndex
|
| + // just output the format specifier literally and move on.
|
| + error(
|
| + 'not enough substitution arguments. Had ' + substitutions.length + ' but needed ' +
|
| + (token.substitutionIndex + 1) + ', so substitution was skipped.');
|
| + result = append(result, '%' + (token.precision > -1 ? token.precision : '') + token.specifier);
|
| + continue;
|
| + }
|
|
|
| - if (!(token.specifier in formatters)) {
|
| - // Encountered an unsupported format character, treat as a string.
|
| - warn("unsupported format character \u201C" + token.specifier + "\u201D. Treating as a string.");
|
| - result = append(result, substitutions[token.substitutionIndex]);
|
| - continue;
|
| - }
|
| + usedSubstitutionIndexes[token.substitutionIndex] = true;
|
|
|
| - result = append(result, formatters[token.specifier](substitutions[token.substitutionIndex], token));
|
| + if (!(token.specifier in formatters)) {
|
| + // Encountered an unsupported format character, treat as a string.
|
| + warn('unsupported format character \u201C' + token.specifier + '\u201D. Treating as a string.');
|
| + result = append(result, substitutions[token.substitutionIndex]);
|
| + continue;
|
| }
|
|
|
| - var unusedSubstitutions = [];
|
| - for (var i = 0; i < substitutions.length; ++i) {
|
| - if (i in usedSubstitutionIndexes)
|
| - continue;
|
| - unusedSubstitutions.push(substitutions[i]);
|
| - }
|
| + result = append(result, formatters[token.specifier](substitutions[token.substitutionIndex], token));
|
| + }
|
|
|
| - return { formattedResult: result, unusedSubstitutions: unusedSubstitutions };
|
| + var unusedSubstitutions = [];
|
| + for (var i = 0; i < substitutions.length; ++i) {
|
| + if (i in usedSubstitutionIndexes)
|
| + continue;
|
| + unusedSubstitutions.push(substitutions[i]);
|
| + }
|
| +
|
| + return {formattedResult: result, unusedSubstitutions: unusedSubstitutions};
|
| };
|
|
|
| /**
|
| @@ -1105,23 +1033,22 @@ String.format = function(format, substitutions, formatters, initialValue, append
|
| * @param {boolean} isRegex
|
| * @return {!RegExp}
|
| */
|
| -function createSearchRegex(query, caseSensitive, isRegex)
|
| -{
|
| - var regexFlags = caseSensitive ? "g" : "gi";
|
| - var regexObject;
|
| -
|
| - if (isRegex) {
|
| - try {
|
| - regexObject = new RegExp(query, regexFlags);
|
| - } catch (e) {
|
| - // Silent catch.
|
| - }
|
| +function createSearchRegex(query, caseSensitive, isRegex) {
|
| + var regexFlags = caseSensitive ? 'g' : 'gi';
|
| + var regexObject;
|
| +
|
| + if (isRegex) {
|
| + try {
|
| + regexObject = new RegExp(query, regexFlags);
|
| + } catch (e) {
|
| + // Silent catch.
|
| }
|
| + }
|
|
|
| - if (!regexObject)
|
| - regexObject = createPlainTextSearchRegex(query, regexFlags);
|
| + if (!regexObject)
|
| + regexObject = createPlainTextSearchRegex(query, regexFlags);
|
|
|
| - return regexObject;
|
| + return regexObject;
|
| }
|
|
|
| /**
|
| @@ -1129,18 +1056,17 @@ function createSearchRegex(query, caseSensitive, isRegex)
|
| * @param {string=} flags
|
| * @return {!RegExp}
|
| */
|
| -function createPlainTextSearchRegex(query, flags)
|
| -{
|
| - // This should be kept the same as the one in StringUtil.cpp.
|
| - var regexSpecialCharacters = String.regexSpecialCharacters();
|
| - var regex = "";
|
| - for (var i = 0; i < query.length; ++i) {
|
| - var c = query.charAt(i);
|
| - if (regexSpecialCharacters.indexOf(c) !== -1)
|
| - regex += "\\";
|
| - regex += c;
|
| - }
|
| - return new RegExp(regex, flags || "");
|
| +function createPlainTextSearchRegex(query, flags) {
|
| + // This should be kept the same as the one in StringUtil.cpp.
|
| + var regexSpecialCharacters = String.regexSpecialCharacters();
|
| + var regex = '';
|
| + for (var i = 0; i < query.length; ++i) {
|
| + var c = query.charAt(i);
|
| + if (regexSpecialCharacters.indexOf(c) !== -1)
|
| + regex += '\\';
|
| + regex += c;
|
| + }
|
| + return new RegExp(regex, flags || '');
|
| }
|
|
|
| /**
|
| @@ -1148,26 +1074,24 @@ function createPlainTextSearchRegex(query, flags)
|
| * @param {string} content
|
| * @return {number}
|
| */
|
| -function countRegexMatches(regex, content)
|
| -{
|
| - var text = content;
|
| - var result = 0;
|
| - var match;
|
| - while (text && (match = regex.exec(text))) {
|
| - if (match[0].length > 0)
|
| - ++result;
|
| - text = text.substring(match.index + 1);
|
| - }
|
| - return result;
|
| +function countRegexMatches(regex, content) {
|
| + var text = content;
|
| + var result = 0;
|
| + var match;
|
| + while (text && (match = regex.exec(text))) {
|
| + if (match[0].length > 0)
|
| + ++result;
|
| + text = text.substring(match.index + 1);
|
| + }
|
| + return result;
|
| }
|
|
|
| /**
|
| * @param {number} spacesCount
|
| * @return {string}
|
| */
|
| -function spacesPadding(spacesCount)
|
| -{
|
| - return "\u00a0".repeat(spacesCount);
|
| +function spacesPadding(spacesCount) {
|
| + return '\u00a0'.repeat(spacesCount);
|
| }
|
|
|
| /**
|
| @@ -1175,30 +1099,27 @@ function spacesPadding(spacesCount)
|
| * @param {number} symbolsCount
|
| * @return {string}
|
| */
|
| -function numberToStringWithSpacesPadding(value, symbolsCount)
|
| -{
|
| - var numberString = value.toString();
|
| - var paddingLength = Math.max(0, symbolsCount - numberString.length);
|
| - return spacesPadding(paddingLength) + numberString;
|
| +function numberToStringWithSpacesPadding(value, symbolsCount) {
|
| + var numberString = value.toString();
|
| + var paddingLength = Math.max(0, symbolsCount - numberString.length);
|
| + return spacesPadding(paddingLength) + numberString;
|
| }
|
|
|
| /**
|
| * @return {!Array.<T>}
|
| * @template T
|
| */
|
| -Set.prototype.valuesArray = function()
|
| -{
|
| - return Array.from(this.values());
|
| +Set.prototype.valuesArray = function() {
|
| + return Array.from(this.values());
|
| };
|
|
|
| /**
|
| * @param {!Iterable<T>|!Array<!T>} iterable
|
| * @template T
|
| */
|
| -Set.prototype.addAll = function(iterable)
|
| -{
|
| - for (var e of iterable)
|
| - this.add(e);
|
| +Set.prototype.addAll = function(iterable) {
|
| + for (var e of iterable)
|
| + this.add(e);
|
| };
|
|
|
| /**
|
| @@ -1206,277 +1127,251 @@ Set.prototype.addAll = function(iterable)
|
| * @return {boolean}
|
| * @template T
|
| */
|
| -Set.prototype.containsAll = function(iterable)
|
| -{
|
| - for (var e of iterable) {
|
| - if (!this.has(e))
|
| - return false;
|
| - }
|
| - return true;
|
| +Set.prototype.containsAll = function(iterable) {
|
| + for (var e of iterable) {
|
| + if (!this.has(e))
|
| + return false;
|
| + }
|
| + return true;
|
| };
|
|
|
| /**
|
| * @return {T}
|
| * @template T
|
| */
|
| -Map.prototype.remove = function(key)
|
| -{
|
| - var value = this.get(key);
|
| - this.delete(key);
|
| - return value;
|
| +Map.prototype.remove = function(key) {
|
| + var value = this.get(key);
|
| + this.delete(key);
|
| + return value;
|
| };
|
|
|
| /**
|
| * @return {!Array<!VALUE>}
|
| */
|
| -Map.prototype.valuesArray = function()
|
| -{
|
| - return Array.from(this.values());
|
| +Map.prototype.valuesArray = function() {
|
| + return Array.from(this.values());
|
| };
|
|
|
| /**
|
| * @return {!Array<!KEY>}
|
| */
|
| -Map.prototype.keysArray = function()
|
| -{
|
| - return Array.from(this.keys());
|
| +Map.prototype.keysArray = function() {
|
| + return Array.from(this.keys());
|
| };
|
|
|
| /**
|
| * @return {!Multimap<!KEY, !VALUE>}
|
| */
|
| -Map.prototype.inverse = function()
|
| -{
|
| - var result = new Multimap();
|
| - for (var key of this.keys()) {
|
| - var value = this.get(key);
|
| - result.set(value, key);
|
| - }
|
| - return result;
|
| +Map.prototype.inverse = function() {
|
| + var result = new Multimap();
|
| + for (var key of this.keys()) {
|
| + var value = this.get(key);
|
| + result.set(value, key);
|
| + }
|
| + return result;
|
| };
|
|
|
| /**
|
| * @constructor
|
| * @template K, V
|
| */
|
| -var Multimap = function()
|
| -{
|
| - /** @type {!Map.<K, !Set.<!V>>} */
|
| - this._map = new Map();
|
| +var Multimap = function() {
|
| + /** @type {!Map.<K, !Set.<!V>>} */
|
| + this._map = new Map();
|
| };
|
|
|
| Multimap.prototype = {
|
| - /**
|
| - * @param {K} key
|
| - * @param {V} value
|
| - */
|
| - set: function(key, value)
|
| - {
|
| - var set = this._map.get(key);
|
| - if (!set) {
|
| - set = new Set();
|
| - this._map.set(key, set);
|
| - }
|
| - set.add(value);
|
| - },
|
| -
|
| - /**
|
| - * @param {K} key
|
| - * @return {!Set.<!V>}
|
| - */
|
| - get: function(key)
|
| - {
|
| - var result = this._map.get(key);
|
| - if (!result)
|
| - result = new Set();
|
| - return result;
|
| - },
|
| -
|
| - /**
|
| - * @param {K} key
|
| - * @return {boolean}
|
| - */
|
| - has: function(key)
|
| - {
|
| - return this._map.has(key);
|
| - },
|
| -
|
| - /**
|
| - * @param {K} key
|
| - * @param {V} value
|
| - * @return {boolean}
|
| - */
|
| - hasValue: function(key, value)
|
| - {
|
| - var set = this._map.get(key);
|
| - if (!set)
|
| - return false;
|
| - return set.has(value);
|
| - },
|
| -
|
| - /**
|
| - * @return {number}
|
| - */
|
| - get size()
|
| - {
|
| - return this._map.size;
|
| - },
|
| -
|
| - /**
|
| - * @param {K} key
|
| - * @param {V} value
|
| - */
|
| - remove: function(key, value)
|
| - {
|
| - var values = this.get(key);
|
| - values.delete(value);
|
| - if (!values.size)
|
| - this._map.delete(key);
|
| - },
|
| -
|
| - /**
|
| - * @param {K} key
|
| - */
|
| - removeAll: function(key)
|
| - {
|
| - this._map.delete(key);
|
| - },
|
| -
|
| - /**
|
| - * @return {!Array.<K>}
|
| - */
|
| - keysArray: function()
|
| - {
|
| - return this._map.keysArray();
|
| - },
|
| -
|
| - /**
|
| - * @return {!Array.<!V>}
|
| - */
|
| - valuesArray: function()
|
| - {
|
| - var result = [];
|
| - var keys = this.keysArray();
|
| - for (var i = 0; i < keys.length; ++i)
|
| - result.pushAll(this.get(keys[i]).valuesArray());
|
| - return result;
|
| - },
|
| -
|
| - clear: function()
|
| - {
|
| - this._map.clear();
|
| + /**
|
| + * @param {K} key
|
| + * @param {V} value
|
| + */
|
| + set: function(key, value) {
|
| + var set = this._map.get(key);
|
| + if (!set) {
|
| + set = new Set();
|
| + this._map.set(key, set);
|
| }
|
| + set.add(value);
|
| + },
|
| +
|
| + /**
|
| + * @param {K} key
|
| + * @return {!Set.<!V>}
|
| + */
|
| + get: function(key) {
|
| + var result = this._map.get(key);
|
| + if (!result)
|
| + result = new Set();
|
| + return result;
|
| + },
|
| +
|
| + /**
|
| + * @param {K} key
|
| + * @return {boolean}
|
| + */
|
| + has: function(key) {
|
| + return this._map.has(key);
|
| + },
|
| +
|
| + /**
|
| + * @param {K} key
|
| + * @param {V} value
|
| + * @return {boolean}
|
| + */
|
| + hasValue: function(key, value) {
|
| + var set = this._map.get(key);
|
| + if (!set)
|
| + return false;
|
| + return set.has(value);
|
| + },
|
| +
|
| + /**
|
| + * @return {number}
|
| + */
|
| + get size() {
|
| + return this._map.size;
|
| + },
|
| +
|
| + /**
|
| + * @param {K} key
|
| + * @param {V} value
|
| + */
|
| + remove: function(key, value) {
|
| + var values = this.get(key);
|
| + values.delete(value);
|
| + if (!values.size)
|
| + this._map.delete(key);
|
| + },
|
| +
|
| + /**
|
| + * @param {K} key
|
| + */
|
| + removeAll: function(key) {
|
| + this._map.delete(key);
|
| + },
|
| +
|
| + /**
|
| + * @return {!Array.<K>}
|
| + */
|
| + keysArray: function() {
|
| + return this._map.keysArray();
|
| + },
|
| +
|
| + /**
|
| + * @return {!Array.<!V>}
|
| + */
|
| + valuesArray: function() {
|
| + var result = [];
|
| + var keys = this.keysArray();
|
| + for (var i = 0; i < keys.length; ++i)
|
| + result.pushAll(this.get(keys[i]).valuesArray());
|
| + return result;
|
| + },
|
| +
|
| + clear: function() {
|
| + this._map.clear();
|
| + }
|
| };
|
|
|
| /**
|
| * @param {string} url
|
| * @return {!Promise.<string>}
|
| */
|
| -function loadXHR(url)
|
| -{
|
| - return new Promise(load);
|
| -
|
| - function load(successCallback, failureCallback)
|
| - {
|
| - function onReadyStateChanged()
|
| - {
|
| - if (xhr.readyState !== XMLHttpRequest.DONE)
|
| - return;
|
| - if (xhr.status !== 200) {
|
| - xhr.onreadystatechange = null;
|
| - failureCallback(new Error(xhr.status));
|
| - return;
|
| - }
|
| - xhr.onreadystatechange = null;
|
| - successCallback(xhr.responseText);
|
| - }
|
| +function loadXHR(url) {
|
| + return new Promise(load);
|
|
|
| - var xhr = new XMLHttpRequest();
|
| - xhr.withCredentials = false;
|
| - xhr.open("GET", url, true);
|
| - xhr.onreadystatechange = onReadyStateChanged;
|
| - xhr.send(null);
|
| + function load(successCallback, failureCallback) {
|
| + function onReadyStateChanged() {
|
| + if (xhr.readyState !== XMLHttpRequest.DONE)
|
| + return;
|
| + if (xhr.status !== 200) {
|
| + xhr.onreadystatechange = null;
|
| + failureCallback(new Error(xhr.status));
|
| + return;
|
| + }
|
| + xhr.onreadystatechange = null;
|
| + successCallback(xhr.responseText);
|
| }
|
| +
|
| + var xhr = new XMLHttpRequest();
|
| + xhr.withCredentials = false;
|
| + xhr.open('GET', url, true);
|
| + xhr.onreadystatechange = onReadyStateChanged;
|
| + xhr.send(null);
|
| + }
|
| }
|
|
|
| /**
|
| - * @constructor
|
| + * @unrestricted
|
| */
|
| -function CallbackBarrier()
|
| -{
|
| +var CallbackBarrier = class {
|
| + constructor() {
|
| this._pendingIncomingCallbacksCount = 0;
|
| -}
|
| -
|
| -CallbackBarrier.prototype = {
|
| - /**
|
| - * @param {function(...)=} userCallback
|
| - * @return {function(...)}
|
| - */
|
| - createCallback: function(userCallback)
|
| - {
|
| - console.assert(!this._outgoingCallback, "CallbackBarrier.createCallback() is called after CallbackBarrier.callWhenDone()");
|
| - ++this._pendingIncomingCallbacksCount;
|
| - return this._incomingCallback.bind(this, userCallback);
|
| - },
|
| + }
|
| +
|
| + /**
|
| + * @param {function(...)=} userCallback
|
| + * @return {function(...)}
|
| + */
|
| + createCallback(userCallback) {
|
| + console.assert(
|
| + !this._outgoingCallback, 'CallbackBarrier.createCallback() is called after CallbackBarrier.callWhenDone()');
|
| + ++this._pendingIncomingCallbacksCount;
|
| + return this._incomingCallback.bind(this, userCallback);
|
| + }
|
| +
|
| + /**
|
| + * @param {function()} callback
|
| + */
|
| + callWhenDone(callback) {
|
| + console.assert(!this._outgoingCallback, 'CallbackBarrier.callWhenDone() is called multiple times');
|
| + this._outgoingCallback = callback;
|
| + if (!this._pendingIncomingCallbacksCount)
|
| + this._outgoingCallback();
|
| + }
|
| +
|
| + /**
|
| + * @return {!Promise.<undefined>}
|
| + */
|
| + donePromise() {
|
| + return new Promise(promiseConstructor.bind(this));
|
|
|
| /**
|
| - * @param {function()} callback
|
| + * @param {function()} success
|
| + * @this {CallbackBarrier}
|
| */
|
| - callWhenDone: function(callback)
|
| - {
|
| - console.assert(!this._outgoingCallback, "CallbackBarrier.callWhenDone() is called multiple times");
|
| - this._outgoingCallback = callback;
|
| - if (!this._pendingIncomingCallbacksCount)
|
| - this._outgoingCallback();
|
| - },
|
| -
|
| - /**
|
| - * @return {!Promise.<undefined>}
|
| - */
|
| - donePromise: function()
|
| - {
|
| - return new Promise(promiseConstructor.bind(this));
|
| -
|
| - /**
|
| - * @param {function()} success
|
| - * @this {CallbackBarrier}
|
| - */
|
| - function promiseConstructor(success)
|
| - {
|
| - this.callWhenDone(success);
|
| - }
|
| - },
|
| -
|
| - /**
|
| - * @param {function(...)=} userCallback
|
| - */
|
| - _incomingCallback: function(userCallback)
|
| - {
|
| - console.assert(this._pendingIncomingCallbacksCount > 0);
|
| - if (userCallback) {
|
| - var args = Array.prototype.slice.call(arguments, 1);
|
| - userCallback.apply(null, args);
|
| - }
|
| - if (!--this._pendingIncomingCallbacksCount && this._outgoingCallback)
|
| - this._outgoingCallback();
|
| + function promiseConstructor(success) {
|
| + this.callWhenDone(success);
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * @param {function(...)=} userCallback
|
| + */
|
| + _incomingCallback(userCallback) {
|
| + console.assert(this._pendingIncomingCallbacksCount > 0);
|
| + if (userCallback) {
|
| + var args = Array.prototype.slice.call(arguments, 1);
|
| + userCallback.apply(null, args);
|
| }
|
| + if (!--this._pendingIncomingCallbacksCount && this._outgoingCallback)
|
| + this._outgoingCallback();
|
| + }
|
| };
|
|
|
| /**
|
| * @param {*} value
|
| */
|
| -function suppressUnused(value)
|
| -{
|
| +function suppressUnused(value) {
|
| }
|
|
|
| /**
|
| * @param {function()} callback
|
| * @return {number}
|
| */
|
| -self.setImmediate = function(callback)
|
| -{
|
| - Promise.resolve().then(callback);
|
| - return 0;
|
| +self.setImmediate = function(callback) {
|
| + Promise.resolve().then(callback);
|
| + return 0;
|
| };
|
|
|
| /**
|
| @@ -1484,14 +1379,12 @@ self.setImmediate = function(callback)
|
| * @return {!Promise.<T>}
|
| * @template T
|
| */
|
| -Promise.prototype.spread = function(callback)
|
| -{
|
| - return this.then(spreadPromise);
|
| +Promise.prototype.spread = function(callback) {
|
| + return this.then(spreadPromise);
|
|
|
| - function spreadPromise(arg)
|
| - {
|
| - return callback.apply(null, arg);
|
| - }
|
| + function spreadPromise(arg) {
|
| + return callback.apply(null, arg);
|
| + }
|
| };
|
|
|
| /**
|
| @@ -1500,10 +1393,10 @@ Promise.prototype.spread = function(callback)
|
| * @template T
|
| */
|
| Promise.prototype.catchException = function(defaultValue) {
|
| - return this.catch(function(error) {
|
| - console.error(error);
|
| - return defaultValue;
|
| - });
|
| + return this.catch(function(error) {
|
| + console.error(error);
|
| + return defaultValue;
|
| + });
|
| };
|
|
|
| /**
|
| @@ -1512,46 +1405,41 @@ Promise.prototype.catchException = function(defaultValue) {
|
| * @return {!{removed: !Array<!VALUE>, added: !Array<?>, equal: !Array<!VALUE>}}
|
| * @this {Map<number, VALUE>}
|
| */
|
| -Map.prototype.diff = function(other, isEqual)
|
| -{
|
| - var leftKeys = this.keysArray();
|
| - var rightKeys = other.keysArray();
|
| - leftKeys.sort((a, b) => a - b);
|
| - rightKeys.sort((a, b) => a - b);
|
| -
|
| - var removed = [];
|
| - var added = [];
|
| - var equal = [];
|
| - var leftIndex = 0;
|
| - var rightIndex = 0;
|
| - while (leftIndex < leftKeys.length && rightIndex < rightKeys.length) {
|
| - var leftKey = leftKeys[leftIndex];
|
| - var rightKey = rightKeys[rightIndex];
|
| - if (leftKey === rightKey && isEqual(this.get(leftKey), other.get(rightKey))) {
|
| - equal.push(this.get(leftKey));
|
| - ++leftIndex;
|
| - ++rightIndex;
|
| - continue;
|
| - }
|
| - if (leftKey <= rightKey) {
|
| - removed.push(this.get(leftKey));
|
| - ++leftIndex;
|
| - continue;
|
| - }
|
| - added.push(other.get(rightKey));
|
| - ++rightIndex;
|
| - }
|
| - while (leftIndex < leftKeys.length) {
|
| - var leftKey = leftKeys[leftIndex++];
|
| - removed.push(this.get(leftKey));
|
| +Map.prototype.diff = function(other, isEqual) {
|
| + var leftKeys = this.keysArray();
|
| + var rightKeys = other.keysArray();
|
| + leftKeys.sort((a, b) => a - b);
|
| + rightKeys.sort((a, b) => a - b);
|
| +
|
| + var removed = [];
|
| + var added = [];
|
| + var equal = [];
|
| + var leftIndex = 0;
|
| + var rightIndex = 0;
|
| + while (leftIndex < leftKeys.length && rightIndex < rightKeys.length) {
|
| + var leftKey = leftKeys[leftIndex];
|
| + var rightKey = rightKeys[rightIndex];
|
| + if (leftKey === rightKey && isEqual(this.get(leftKey), other.get(rightKey))) {
|
| + equal.push(this.get(leftKey));
|
| + ++leftIndex;
|
| + ++rightIndex;
|
| + continue;
|
| }
|
| - while (rightIndex < rightKeys.length) {
|
| - var rightKey = rightKeys[rightIndex++];
|
| - added.push(other.get(rightKey));
|
| + if (leftKey <= rightKey) {
|
| + removed.push(this.get(leftKey));
|
| + ++leftIndex;
|
| + continue;
|
| }
|
| - return {
|
| - added: added,
|
| - removed: removed,
|
| - equal: equal
|
| - };
|
| + added.push(other.get(rightKey));
|
| + ++rightIndex;
|
| + }
|
| + while (leftIndex < leftKeys.length) {
|
| + var leftKey = leftKeys[leftIndex++];
|
| + removed.push(this.get(leftKey));
|
| + }
|
| + while (rightIndex < rightKeys.length) {
|
| + var rightKey = rightKeys[rightIndex++];
|
| + added.push(other.get(rightKey));
|
| + }
|
| + return {added: added, removed: removed, equal: equal};
|
| };
|
|
|