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.

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

lib: remove some yoda statements #18746

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
lib,test: remove yoda statements
BridgeAR committed Mar 2, 2018
commit 2bfed5b9aabaa2a5ae3afeb236b6ce813752619d
2 changes: 1 addition & 1 deletion lib/_stream_readable.js
Original file line number Diff line number Diff line change
@@ -838,7 +838,7 @@ function resume_(stream, state) {

Readable.prototype.pause = function() {
debug('call pause flowing=%j', this._readableState.flowing);
if (false !== this._readableState.flowing) {
if (this._readableState.flowing !== false) {
debug('pause');
this._readableState.flowing = false;
this.emit('pause');
30 changes: 15 additions & 15 deletions lib/internal/readline.js
Original file line number Diff line number Diff line change
@@ -87,33 +87,33 @@ if (process.binding('config').hasIntl) {
if (
code >= 0x1100 && (
code <= 0x115f || // Hangul Jamo
0x2329 === code || // LEFT-POINTING ANGLE BRACKET
0x232a === code || // RIGHT-POINTING ANGLE BRACKET
code === 0x2329 || // LEFT-POINTING ANGLE BRACKET
code === 0x232a || // RIGHT-POINTING ANGLE BRACKET
// CJK Radicals Supplement .. Enclosed CJK Letters and Months
(0x2e80 <= code && code <= 0x3247 && code !== 0x303f) ||
Copy link
Contributor

Choose a reason for hiding this comment

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

Most of the changes seem good to me but I wonder if this whole block is the one exception? It's basically making it look like 0 <= code <= 100, which is actually kinda nice readability wise.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you feel strongly about it? Otherwise I would just go ahead and land it as is.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nope. :)

code >= 0x2e80 && code <= 0x3247 && code !== 0x303f ||
// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
0x3250 <= code && code <= 0x4dbf ||
code >= 0x3250 && code <= 0x4dbf ||
// CJK Unified Ideographs .. Yi Radicals
0x4e00 <= code && code <= 0xa4c6 ||
code >= 0x4e00 && code <= 0xa4c6 ||
// Hangul Jamo Extended-A
0xa960 <= code && code <= 0xa97c ||
code >= 0xa960 && code <= 0xa97c ||
// Hangul Syllables
0xac00 <= code && code <= 0xd7a3 ||
code >= 0xac00 && code <= 0xd7a3 ||
// CJK Compatibility Ideographs
0xf900 <= code && code <= 0xfaff ||
code >= 0xf900 && code <= 0xfaff ||
// Vertical Forms
0xfe10 <= code && code <= 0xfe19 ||
code >= 0xfe10 && code <= 0xfe19 ||
// CJK Compatibility Forms .. Small Form Variants
0xfe30 <= code && code <= 0xfe6b ||
code >= 0xfe30 && code <= 0xfe6b ||
// Halfwidth and Fullwidth Forms
0xff01 <= code && code <= 0xff60 ||
0xffe0 <= code && code <= 0xffe6 ||
code >= 0xff01 && code <= 0xff60 ||
code >= 0xffe0 && code <= 0xffe6 ||
// Kana Supplement
0x1b000 <= code && code <= 0x1b001 ||
code >= 0x1b000 && code <= 0x1b001 ||
// Enclosed Ideographic Supplement
0x1f200 <= code && code <= 0x1f251 ||
code >= 0x1f200 && code <= 0x1f251 ||
// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
0x20000 <= code && code <= 0x3fffd
code >= 0x20000 && code <= 0x3fffd
)
) {
return true;
6 changes: 2 additions & 4 deletions lib/internal/streams/legacy.js
Original file line number Diff line number Diff line change
@@ -12,10 +12,8 @@ Stream.prototype.pipe = function(dest, options) {
var source = this;

function ondata(chunk) {
if (dest.writable) {
if (false === dest.write(chunk) && source.pause) {
source.pause();
}
if (dest.writable && dest.write(chunk) === false && source.pause) {
source.pause();
}
}

4 changes: 2 additions & 2 deletions test/common/inspector-helper.js
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ class InspectorSession {
}

_isBreakOnLineNotification(message, line, expectedScriptPath) {
if ('Debugger.paused' === message.method) {
if (message.method === 'Debugger.paused') {
const callFrame = message.params.callFrames[0];
const location = callFrame.location;
const scriptPath = this._scriptsIdsByUrl.get(location.scriptId);
@@ -264,7 +264,7 @@ class InspectorSession {
_matchesConsoleOutputNotification(notification, type, values) {
if (!Array.isArray(values))
values = [ values ];
if ('Runtime.consoleAPICalled' === notification.method) {
if (notification.method === 'Runtime.consoleAPICalled') {
const params = notification.params;
if (params.type === type) {
let i = 0;
2 changes: 1 addition & 1 deletion test/parallel/test-dns-multi-channel.js
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ for (const { socket, reply } of servers) {
}));

socket.bind(0, common.mustCall(() => {
if (0 === --waiting) ready();
if (--waiting === 0) ready();
}));
}

2 changes: 1 addition & 1 deletion test/parallel/test-fs-watch-recursive.js
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ const watcher = fs.watch(testDir, { recursive: true });

let watcherClosed = false;
watcher.on('change', function(event, filename) {
assert.ok('change' === event || 'rename' === event);
assert.ok(event === 'change' || event === 'rename');

// Ignore stale events generated by mkdir and other tests
if (filename !== relativePathOne)
2 changes: 1 addition & 1 deletion test/parallel/test-net-pingpong.js
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ function pingPongTest(port, host) {
// Since we never queue data (we're always waiting for the PING
// before sending a pong) the writeQueueSize should always be less
// than one message.
assert.ok(0 <= socket.bufferSize && socket.bufferSize <= 4);
assert.ok(socket.bufferSize >= 0 && socket.bufferSize <= 4);

assert.strictEqual(socket.writable, true);
assert.strictEqual(socket.readable, true);
2 changes: 1 addition & 1 deletion test/parallel/test-net-server-max-connections.js
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ function makeConnection(index) {

c.on('data', function(b) {
gotData = true;
assert.ok(0 < b.length);
assert.ok(b.length > 0);
});

c.on('error', function(e) {
2 changes: 1 addition & 1 deletion test/parallel/test-tls-pause.js
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ server.listen(0, common.mustCall(() => {
console.error('sending');
const ret = client.write(Buffer.allocUnsafe(bufSize));
console.error(`write => ${ret}`);
if (false !== ret) {
if (ret !== false) {
console.error('write again');
sent += bufSize;
assert.ok(sent < 100 * 1024 * 1024); // max 100MB
2 changes: 1 addition & 1 deletion test/pummel/test-net-throttle.js
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ const server = net.createServer(function(connection) {
connection.write(body.slice(part_N, 2 * part_N));
assert.strictEqual(false, connection.write(body.slice(2 * part_N, N)));
console.log(`bufferSize: ${connection.bufferSize}`, 'expecting', N);
assert.ok(0 <= connection.bufferSize &&
assert.ok(connection.bufferSize >= 0 &&
connection.writableLength <= N);
connection.end();
});
2 changes: 1 addition & 1 deletion test/pummel/test-next-tick-infinite-calls.js
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ let complete = 0;
// FATAL ERROR: JS Allocation failed - process out of memory
// if the depth counter doesn't clear the nextTickQueue properly.
(function runner() {
if (1e8 > ++complete)
if (++complete < 1e8)
process.nextTick(runner);
}());