Browse Source

util: improve format() performance further

Replacing the regexp and replace function with a loop improves
performance by ~60-200%.

PR-URL: https://github.com/nodejs/node/pull/5360
Reviewed-By: James M Snell <jasnell@gmail.com>
v4.x
Brian White 9 years ago
committed by Myles Borins
parent
commit
d0bf09d3ad
  1. 73
      lib/util.js

73
lib/util.js

@ -17,7 +17,6 @@ function tryStringify(arg) {
} }
} }
const formatRegExp = /%[sdj%]/g;
exports.format = function(f) { exports.format = function(f) {
if (typeof f !== 'string') { if (typeof f !== 'string') {
const objects = new Array(arguments.length); const objects = new Array(arguments.length);
@ -27,30 +26,56 @@ exports.format = function(f) {
return objects.join(' '); return objects.join(' ');
} }
if (arguments.length === 1) return f; var argLen = arguments.length;
const len = arguments.length; if (argLen === 1) return f;
const args = new Array(len);
var i; var str = '';
for (i = 0; i < len; i++) { var a = 1;
args[i] = arguments[i]; var lastPos = 0;
} for (var i = 0; i < f.length;) {
if (f.charCodeAt(i) === 37/*'%'*/ && i + 1 < f.length) {
i = 1; switch (f.charCodeAt(i + 1)) {
var str = f.replace(formatRegExp, function(x) { case 100: // 'd'
if (x === '%%') return '%'; if (a >= argLen)
if (i >= len) return x; break;
switch (x) { if (lastPos < i)
case '%s': return String(args[i++]); str += f.slice(lastPos, i);
case '%d': return Number(args[i++]); str += Number(arguments[a++]);
case '%j': return tryStringify(args[i++]); lastPos = i = i + 2;
// falls through continue;
default: case 106: // 'j'
return x; if (a >= argLen)
break;
if (lastPos < i)
str += f.slice(lastPos, i);
str += tryStringify(arguments[a++]);
lastPos = i = i + 2;
continue;
case 115: // 's'
if (a >= argLen)
break;
if (lastPos < i)
str += f.slice(lastPos, i);
str += String(arguments[a++]);
lastPos = i = i + 2;
continue;
case 37: // '%'
if (lastPos < i)
str += f.slice(lastPos, i);
str += '%';
lastPos = i = i + 2;
continue;
}
} }
}); ++i;
while (i < len) { }
const x = args[i++]; if (lastPos === 0)
str = f;
else if (lastPos < f.length)
str += f.slice(lastPos);
while (a < argLen) {
const x = arguments[a++];
if (x === null || (typeof x !== 'object' && typeof x !== 'symbol')) { if (x === null || (typeof x !== 'object' && typeof x !== 'symbol')) {
str += ' ' + x; str += ' ' + x;
} else { } else {

Loading…
Cancel
Save