daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use runInNewContext instead of process.compile

pull/5370/head
Ryan Dahl 2010-11-21 15:16:02 -08:00
parent b1088d6bd2
commit a16b3c3148
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/node.js
View File

@ -28,7 +28,7 @@ process.assert = function (x, msg) {
}; };
var writeError = process.binding('stdio').writeError; var writeError = process.binding('stdio').writeError;
var evals = process.binding('evals');
// lazy loaded. // lazy loaded.
var constants; var constants;
@ -118,7 +118,7 @@ var module = (function () {
return replModule.exports; return replModule.exports;
} }
var fn = process.compile( var fn = evals.Script.runInThisContext(
"(function (exports, require) {" + natives[id] + "\n})", "(function (exports, require) {" + natives[id] + "\n})",
id + '.js'); id + '.js');
var m = new Module(id); var m = new Module(id);
@ -303,8 +303,6 @@ var module = (function () {
var dirname = path.dirname(filename); var dirname = path.dirname(filename);
if (contextLoad) { if (contextLoad) {
if (!Script) Script = process.binding('evals').Script;
if (self.id !== ".") { if (self.id !== ".") {
debug('load submodule'); debug('load submodule');
// not root module // not root module
@ -320,7 +318,7 @@ var module = (function () {
sandbox.global = sandbox; sandbox.global = sandbox;
sandbox.root = root; sandbox.root = root;
Script.runInNewContext(content, sandbox, filename); evals.Script.runInNewContext(content, sandbox, filename);
} else { } else {
debug('load root module'); debug('load root module');
@ -330,7 +328,7 @@ var module = (function () {
global.__filename = filename; global.__filename = filename;
global.__dirname = dirname; global.__dirname = dirname;
global.module = self; global.module = self;
Script.runInThisContext(content, filename); evals.Script.runInThisContext(content, filename);
} }
} else { } else {
@ -339,7 +337,7 @@ var module = (function () {
+ content + content
+ "\n});"; + "\n});";
var compiledWrapper = process.compile(wrapper, filename); var compiledWrapper = evals.Script.runInThisContext(wrapper, filename);
if (filename === process.argv[1] && global.v8debug) { if (filename === process.argv[1] && global.v8debug) {
global.v8debug.Debug.setBreakPoint(compiledWrapper, 0, 0); global.v8debug.Debug.setBreakPoint(compiledWrapper, 0, 0);
} }