GeezerVison is showing github.com — src: rename "node" script to "bootstrap_node" · nodejs/node@6dc0dae
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: src/node.cc +5-5Lines changed: 5 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -3322,10 +3322,6 @@ void LoadEnvironment(Environment* env) { | 3322 | 3322 | env->isolate()->SetFatalErrorHandler(node::OnFatalError); | 3323 | 3323 | env->isolate()->AddMessageListener(OnMessage); | 3324 | 3324 |
| 3325 | | - // Compile, execute the src/node.js file. (Which was included as static C | 3326 | | - // string in node_natives.h. 'native_node' is the string containing that | 3327 | | - // source code.) | 3328 | | - | 3329 | 3325 | // The node.js file returns a function 'f' | 3330 | 3326 | atexit(AtExit); | 3331 | 3327 |
| @@ -3336,7 +3332,11 @@ void LoadEnvironment(Environment* env) { | 3336 | 3332 | // are not safe to ignore. | 3337 | 3333 | try_catch.SetVerbose(false); | 3338 | 3334 |
| 3339 | | - Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(), "node.js"); | | 3335 | + // Execute the lib/internal/bootstrap_node.js file which was included as a | | 3336 | + // static C string in node_natives.h by node_js2c. | | 3337 | + // 'internal_bootstrap_node_native' is the string containing that source code. | | 3338 | + Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(), | | 3339 | + "bootstrap_node.js"); | 3340 | 3340 | Local<Value> f_value = ExecuteString(env, MainSource(env), script_name); | 3341 | 3341 | if (try_catch.HasCaught()) { | 3342 | 3342 | ReportException(env, try_catch); | |
Collapse file Copy file name to clipboardExpand all lines: test/message/core_line_numbers.out +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -12,4 +12,4 @@ RangeError: Invalid input | 12 | 12 | at tryModuleLoad (module.js:*:*) | 13 | 13 | at Function.Module._load (module.js:*:*) | 14 | 14 | at Module.runMain (module.js:*:*) | 15 | | - at run (node.js:*:*) | | 15 | + at run (bootstrap_node.js:*:*) |
Collapse file Copy file name to clipboardExpand all lines: test/message/error_exit.out +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -11,6 +11,6 @@ AssertionError: 1 == 2 | 11 | 11 | at tryModuleLoad (module.js:*:*) | 12 | 12 | at Function.Module._load (module.js:*:*) | 13 | 13 | at Module.runMain (module.js:*:*) | 14 | | - at run (node.js:*:*) | 15 | | - at startup (node.js:*:*) | 16 | | - at node.js:*:* | | 14 | + at run (bootstrap_node.js:*:*) | | 15 | + at startup (bootstrap_node.js:*:*) | | 16 | + at bootstrap_node.js:*:* |
Collapse file Copy file name to clipboardExpand all lines: test/message/eval_messages.out +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -6,7 +6,7 @@ SyntaxError: Strict mode code may not include a with statement | 6 | 6 | at Object.exports.runInThisContext (vm.js:*) | 7 | 7 | at Object.<anonymous> ([eval]-wrapper:*:*) | 8 | 8 | at Module._compile (module.js:*:*) | 9 | | - at node.js:*:* | | 9 | + at bootstrap_node.js:*:* | 10 | 10 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 11 | 11 | at process._tickCallback (internal/process/next_tick.js:*:*) | 12 | 12 | 42 | @@ -19,7 +19,7 @@ Error: hello | 19 | 19 | at Object.exports.runInThisContext (vm.js:*) | 20 | 20 | at Object.<anonymous> ([eval]-wrapper:*:*) | 21 | 21 | at Module._compile (module.js:*:*) | 22 | | - at node.js:*:* | | 22 | + at bootstrap_node.js:*:* | 23 | 23 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 24 | 24 | at process._tickCallback (internal/process/next_tick.js:*:*) | 25 | 25 | [eval]:1 | @@ -30,7 +30,7 @@ Error: hello | 30 | 30 | at Object.exports.runInThisContext (vm.js:*) | 31 | 31 | at Object.<anonymous> ([eval]-wrapper:*:*) | 32 | 32 | at Module._compile (module.js:*:*) | 33 | | - at node.js:*:* | | 33 | + at bootstrap_node.js:*:* | 34 | 34 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 35 | 35 | at process._tickCallback (internal/process/next_tick.js:*:*) | 36 | 36 | 100 | @@ -42,7 +42,7 @@ ReferenceError: y is not defined | 42 | 42 | at Object.exports.runInThisContext (vm.js:*) | 43 | 43 | at Object.<anonymous> ([eval]-wrapper:*:*) | 44 | 44 | at Module._compile (module.js:*:*) | 45 | | - at node.js:*:* | | 45 | + at bootstrap_node.js:*:* | 46 | 46 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 47 | 47 | at process._tickCallback (internal/process/next_tick.js:*:*) | 48 | 48 | [eval]:1 | |
Collapse file Copy file name to clipboardExpand all lines: test/message/nexttick_throw.out +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -7,6 +7,6 @@ ReferenceError: undefined_reference_error_maker is not defined | 7 | 7 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 8 | 8 | at process._tickCallback (internal/process/next_tick.js:*:*) | 9 | 9 | at Module.runMain (module.js:*:*) | 10 | | - at run (node.js:*:*) | 11 | | - at startup (node.js:*:*) | 12 | | - at node.js:*:* | | 10 | + at run (bootstrap_node.js:*:*) | | 11 | + at startup (bootstrap_node.js:*:*) | | 12 | + at bootstrap_node.js:*:* |
Collapse file Copy file name to clipboardExpand all lines: test/message/stdin_messages.out +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -7,7 +7,7 @@ SyntaxError: Strict mode code may not include a with statement | 7 | 7 | at Object.exports.runInThisContext (vm.js:*) | 8 | 8 | at Object.<anonymous> ([stdin]-wrapper:*:*) | 9 | 9 | at Module._compile (module.js:*:*) | 10 | | - at node.js:*:* | | 10 | + at bootstrap_node.js:*:* | 11 | 11 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 12 | 12 | at process._tickCallback (internal/process/next_tick.js:*:*) | 13 | 13 | 42 | @@ -21,7 +21,7 @@ Error: hello | 21 | 21 | at Object.exports.runInThisContext (vm.js:*) | 22 | 22 | at Object.<anonymous> ([stdin]-wrapper:*:*) | 23 | 23 | at Module._compile (module.js:*:*) | 24 | | - at node.js:*:* | | 24 | + at bootstrap_node.js:*:* | 25 | 25 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 26 | 26 | at process._tickCallback (internal/process/next_tick.js:*:*) | 27 | 27 |
| @@ -33,7 +33,7 @@ Error: hello | 33 | 33 | at Object.exports.runInThisContext (vm.js:*) | 34 | 34 | at Object.<anonymous> ([stdin]-wrapper:*:*) | 35 | 35 | at Module._compile (module.js:*:*) | 36 | | - at node.js:*:* | | 36 | + at bootstrap_node.js:*:* | 37 | 37 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 38 | 38 | at process._tickCallback (internal/process/next_tick.js:*:*) | 39 | 39 | 100 | @@ -46,7 +46,7 @@ ReferenceError: y is not defined | 46 | 46 | at Object.exports.runInThisContext (vm.js:*) | 47 | 47 | at Object.<anonymous> ([stdin]-wrapper:*:*) | 48 | 48 | at Module._compile (module.js:*:*) | 49 | | - at node.js:*:* | | 49 | + at bootstrap_node.js:*:* | 50 | 50 | at _combinedTickCallback (internal/process/next_tick.js:*:*) | 51 | 51 | at process._tickCallback (internal/process/next_tick.js:*:*) | 52 | 52 |
| |
Collapse file Copy file name to clipboardExpand all lines: test/message/vm_display_runtime_error.out +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -13,4 +13,4 @@ Error: boo! | 13 | 13 | at tryModuleLoad (module.js:*:*) | 14 | 14 | at Function.Module._load (module.js:*) | 15 | 15 | at Module.runMain (module.js:*) | 16 | | - at run (node.js:*) | | 16 | + at run (bootstrap_node.js:*) |
Collapse file Copy file name to clipboardExpand all lines: test/message/vm_display_syntax_error.out +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -12,8 +12,8 @@ SyntaxError: Unexpected number | 12 | 12 | at tryModuleLoad (module.js:*:*) | 13 | 13 | at Function.Module._load (module.js:*) | 14 | 14 | at Module.runMain (module.js:*) | 15 | | - at run (node.js:*) | 16 | | - at startup (node.js:*) | | 15 | + at run (bootstrap_node.js:*) | | 16 | + at startup (bootstrap_node.js:*) | 17 | 17 | test.vm:1 | 18 | 18 | var 5; | 19 | 19 | ^ | @@ -26,5 +26,5 @@ SyntaxError: Unexpected number | 26 | 26 | at tryModuleLoad (module.js:*:*) | 27 | 27 | at Function.Module._load (module.js:*) | 28 | 28 | at Module.runMain (module.js:*) | 29 | | - at run (node.js:*) | 30 | | - at startup (node.js:*) | | 29 | + at run (bootstrap_node.js:*) | | 30 | + at startup (bootstrap_node.js:*) |
Collapse file Copy file name to clipboardExpand all lines: test/message/vm_dont_display_runtime_error.out +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -13,4 +13,4 @@ Error: boo! | 13 | 13 | at tryModuleLoad (module.js:*:*) | 14 | 14 | at Function.Module._load (module.js:*) | 15 | 15 | at Module.runMain (module.js:*) | 16 | | - at run (node.js:*) | | 16 | + at run (bootstrap_node.js:*) |
Collapse file Copy file name to clipboardExpand all lines: test/message/vm_dont_display_syntax_error.out +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -12,5 +12,5 @@ SyntaxError: Unexpected number | 12 | 12 | at tryModuleLoad (module.js:*:*) | 13 | 13 | at Function.Module._load (module.js:*) | 14 | 14 | at Module.runMain (module.js:*) | 15 | | - at run (node.js:*) | 16 | | - at startup (node.js:*) | | 15 | + at run (bootstrap_node.js:*) | | 16 | + at startup (bootstrap_node.js:*) |
|