Skip to content

node: s/doNTCallbackX/nextTickCallbackWithXArgs/ #4167

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

Closed
rvagg wants to merge 1 commit into from
Closed

node: s/doNTCallbackX/nextTickCallbackWithXArgs/ #4167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions src/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,20 +356,20 @@
// callback invocation with small numbers of arguments to avoid the
// performance hit associated with using `fn.apply()`
if (args === undefined) {
doNTCallback0(callback);
nextTickCallbackWith0Args(callback);
} else {
switch (args.length) {
case 1:
doNTCallback1(callback, args[0]);
nextTickCallbackWith1Arg(callback, args[0]);
break;
case 2:
doNTCallback2(callback, args[0], args[1]);
nextTickCallbackWith2Args(callback, args[0], args[1]);
break;
case 3:
doNTCallback3(callback, args[0], args[1], args[2]);
nextTickCallbackWith3Args(callback, args[0], args[1], args[2]);
break;
default:
doNTCallbackMany(callback, args);
nextTickCallbackWithManyArgs(callback, args);
}
}
if (1e4 < tickInfo[kIndex])
Expand Down Expand Up @@ -397,20 +397,20 @@
// callback invocation with small numbers of arguments to avoid the
// performance hit associated with using `fn.apply()`
if (args === undefined) {
doNTCallback0(callback);
nextTickCallbackWith0Args(callback);
} else {
switch (args.length) {
case 1:
doNTCallback1(callback, args[0]);
nextTickCallbackWith1Arg(callback, args[0]);
break;
case 2:
doNTCallback2(callback, args[0], args[1]);
nextTickCallbackWith2Args(callback, args[0], args[1]);
break;
case 3:
doNTCallback3(callback, args[0], args[1], args[2]);
nextTickCallbackWith3Args(callback, args[0], args[1], args[2]);
break;
default:
doNTCallbackMany(callback, args);
nextTickCallbackWithManyArgs(callback, args);
}
}
if (1e4 < tickInfo[kIndex])
Expand All @@ -424,7 +424,7 @@
} while (tickInfo[kLength] !== 0);
}

function doNTCallback0(callback) {
function nextTickCallbackWith0Args(callback) {
var threw = true;
try {
callback();
Expand All @@ -435,7 +435,7 @@
}
}

function doNTCallback1(callback, arg1) {
function nextTickCallbackWith1Arg(callback, arg1) {
var threw = true;
try {
callback(arg1);
Expand All @@ -446,7 +446,7 @@
}
}

function doNTCallback2(callback, arg1, arg2) {
function nextTickCallbackWith2Args(callback, arg1, arg2) {
var threw = true;
try {
callback(arg1, arg2);
Expand All @@ -457,7 +457,7 @@
}
}

function doNTCallback3(callback, arg1, arg2, arg3) {
function nextTickCallbackWith3Args(callback, arg1, arg2, arg3) {
var threw = true;
try {
callback(arg1, arg2, arg3);
Expand All @@ -468,7 +468,7 @@
}
}

function doNTCallbackMany(callback, args) {
function nextTickCallbackWithManyArgs(callback, args) {
var threw = true;
try {
callback.apply(null, args);
Expand Down
8 changes: 4 additions & 4 deletions test/message/eval_messages.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SyntaxError: Strict mode code may not include a with statement
at Object.<anonymous> ([eval]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
42
42
Expand All @@ -20,7 +20,7 @@ Error: hello
at Object.<anonymous> ([eval]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
[eval]:1
throw new Error("hello")
Expand All @@ -31,7 +31,7 @@ Error: hello
at Object.<anonymous> ([eval]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
100
[eval]:1
Expand All @@ -43,7 +43,7 @@ ReferenceError: y is not defined
at Object.<anonymous> ([eval]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
[eval]:1
var ______________________________________________; throw 10
Expand Down
2 changes: 1 addition & 1 deletion test/message/nexttick_throw.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
^
ReferenceError: undefined_reference_error_maker is not defined
at *test*message*nexttick_throw.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
at Function.Module.runMain (module.js:*:*)
at startup (node.js:*:*)
Expand Down
8 changes: 4 additions & 4 deletions test/message/stdin_messages.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SyntaxError: Strict mode code may not include a with statement
at Object.<anonymous> ([stdin]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
42
42
Expand All @@ -22,7 +22,7 @@ Error: hello
at Object.<anonymous> ([stdin]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)

[stdin]:1
Expand All @@ -34,7 +34,7 @@ Error: hello
at Object.<anonymous> ([stdin]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)
100

Expand All @@ -47,7 +47,7 @@ ReferenceError: y is not defined
at Object.<anonymous> ([stdin]-wrapper:*:*)
at Module._compile (module.js:*:*)
at node.js:*:*
at doNTCallback0 (node.js:*:*)
at nextTickCallbackWith0Args (node.js:*:*)
at process._tickCallback (node.js:*:*)

[stdin]:1
Expand Down