Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

util: refactor format method. #12407

Closed
wants to merge 8 commits into from
Closed

util: refactor format method. #12407

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2d11e81
util: refactor format method.Performance improved.
jesus-seijas-sp Apr 14, 2017
181ec8a
util: Added tests and fix bugs
jesus-seijas-sp Apr 14, 2017
aa30bb2
Removed unnecesary newline
jesus-seijas-sp Apr 14, 2017
bf6f8fe
util: refactor format method.
jesus-seijas-sp Apr 15, 2017
9d032c2
util: refactor format method.
jesus-seijas-sp Apr 15, 2017
da7a15e
util: refactor format method
jesus-seijas-sp Apr 16, 2017
78118c7
Fix lint
jesus-seijas-sp Apr 16, 2017
9f762cf
util: refactor format method
jesus-seijas-sp May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,71 +68,59 @@ exports.format = function(f) {
return objects.join(' ');
}

var argLen = arguments.length;

if (argLen === 1) return f;
if (arguments.length === 1) return f;

var str = '';
var a = 1;
var lastPos = 0;
for (var i = 0; i < f.length;) {
if (f.charCodeAt(i) === 37/*'%'*/ && i + 1 < f.length) {
if (f.charCodeAt(i) === 37/*'%'*/ && f.length > i + 1) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think having the "static" portion on the right-hand side is more traditional.

if (f.charCodeAt(i + 1) !== 37 && a >= arguments.length) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The /*'%'*/ is missing here for consistency.

++i;
continue;
}
switch (f.charCodeAt(i + 1)) {
case 100: // 'd'
if (a >= argLen)
break;
if (lastPos < i)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer this style because lastPos will always be either less than or equal to i.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I didn't understand this point. You meain only remain lastPos < i instead of i > lastPos ? Thank you!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean I prefer lastPos < i

if (i > lastPos)
str += f.slice(lastPos, i);
str += Number(arguments[a++]);
lastPos = i = i + 2;
continue;
break;
case 105: // 'i'
if (a >= argLen)
break;
if (lastPos < i)
if (i > lastPos)
str += f.slice(lastPos, i);
str += parseInt(arguments[a++]);
lastPos = i = i + 2;
continue;
break;
case 102: // 'f'
if (a >= argLen)
break;
if (lastPos < i)
if (i > lastPos)
str += f.slice(lastPos, i);
str += parseFloat(arguments[a++]);
lastPos = i = i + 2;
continue;
break;
case 106: // 'j'
if (a >= argLen)
break;
if (lastPos < i)
if (i > lastPos)
str += f.slice(lastPos, i);
str += tryStringify(arguments[a++]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems this function was used only here (linter reports 'tryStringify' is defined but never used)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. I commited the changes. Also passed all tests.

lastPos = i = i + 2;
continue;
break;
case 115: // 's'
if (a >= argLen)
break;
if (lastPos < i)
if (i > lastPos)
str += f.slice(lastPos, i);
str += String(arguments[a++]);
lastPos = i = i + 2;
continue;
break;
case 37: // '%'
if (lastPos < i)
if (i > lastPos)
str += f.slice(lastPos, i);
str += '%';
lastPos = i = i + 2;
continue;
break;
}
lastPos = i = i + 2;
continue;
}
++i;
}
if (lastPos === 0)
str = f;
else if (lastPos < f.length)
str += f.slice(lastPos);
while (a < argLen) {
while (a < arguments.length) {
const x = arguments[a++];
if (x === null || (typeof x !== 'object' && typeof x !== 'symbol')) {
str += ' ' + x;
Expand All @@ -143,7 +131,6 @@ exports.format = function(f) {
return str;
};


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unintended whitespace change?

exports.deprecate = internalUtil.deprecate;


Expand Down
8 changes: 8 additions & 0 deletions test/parallel/test-util-format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ assert.strictEqual(util.format('%%s%s', 'foo'), '%sfoo');
assert.strictEqual(util.format('%s:%s'), '%s:%s');
assert.strictEqual(util.format('%s:%s', undefined), 'undefined:%s');
assert.strictEqual(util.format('%s:%s', 'foo'), 'foo:%s');
assert.strictEqual(util.format('%s:%i', 'foo'), 'foo:%i');
assert.strictEqual(util.format('%s:%f', 'foo'), 'foo:%f');
assert.strictEqual(util.format('%s:%s', 'foo', 'bar'), 'foo:bar');
assert.strictEqual(util.format('%s:%s', 'foo', 'bar', 'baz'), 'foo:bar baz');
assert.strictEqual(util.format('%%%s%%', 'hi'), '%hi%');
Expand All @@ -104,6 +106,12 @@ assert.strictEqual(util.format('%sbc%%def', 'a'), 'abc%def');
assert.strictEqual(util.format('%d:%d', 12, 30), '12:30');
assert.strictEqual(util.format('%d:%d', 12), '12:%d');
assert.strictEqual(util.format('%d:%d'), '%d:%d');
assert.strictEqual(util.format('%i:%i', 12, 30), '12:30');
assert.strictEqual(util.format('%i:%i', 12), '12:%i');
assert.strictEqual(util.format('%i:%i'), '%i:%i');
assert.strictEqual(util.format('%f:%f', 12, 30), '12:30');
assert.strictEqual(util.format('%f:%f', 12), '12:%f');
assert.strictEqual(util.format('%f:%f'), '%f:%f');
assert.strictEqual(util.format('o: %j, a: %j', {}, []), 'o: {}, a: []');
assert.strictEqual(util.format('o: %j, a: %j', {}), 'o: {}, a: %j');
assert.strictEqual(util.format('o: %j, a: %j'), 'o: %j, a: %j');
Expand Down