From bb6d468dd83a3a9e59b053b706242ae7b7bf1a17 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 21 Nov 2010 15:06:20 -0800 Subject: [PATCH] requireNative doesn't depend on rest of module system --- src/node.js | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/node.js b/src/node.js index 5baa6aad40..d9684d7832 100644 --- a/src/node.js +++ b/src/node.js @@ -104,22 +104,32 @@ var module = (function () { // Like, natives.fs is the contents of lib/fs.js var natives = process.binding('natives'); - function loadNative (id) { + // Native modules don't need a full require function. So we can bootstrap + // most of the system with this mini-require. + function requireNative (id) { + if (internalModuleCache[id]) return internalModuleCache[id].exports; + if (!natives[id]) throw new Error('No such native module ' + id); + + // REPL is a special case, because it needs the real require. + if (id == 'repl') { + var replModule = new Module("repl"); + replModule._compile(natives.repl, 'repl.js'); + internalModuleCache.repl = replModule; + return replModule.exports; + } + + var fn = process.compile( + "(function (exports, require) {" + natives[id] + "\n})", + id + '.js'); var m = new Module(id); + fn(m.exports, requireNative); + m.loaded = true; internalModuleCache[id] = m; - var e = m._compile(natives[id], id+".js"); - if (e) throw e; // error compiling native module - return m; + return m.exports; } exports.requireNative = requireNative; - function requireNative (id) { - if (internalModuleCache[id]) return internalModuleCache[id].exports; - if (!natives[id]) throw new Error('No such native module ' + id); - return loadNative(id).exports; - } - // Modules @@ -230,7 +240,7 @@ var module = (function () { } if (natives[id]) { debug('load native module ' + request); - return loadNative(id).exports; + return requireNative(id); } var cachedModule = moduleCache[filename];