Move evals to extension module.

nodejs · Jul 14, 2010 · 870aa3d · 870aa3d
1 parent ace2be8
commit 870aa3d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -1505,11 +1505,6 @@ static Handle<Value> Binding(const Arguments& args) {
     exports = Object::New();
     modp->register_func(exports);
     binding_cache->Set(module, exports);
-  } else if (!strcmp(*module_v, "evals")) {
-    exports = Object::New();
-    node::Context::Initialize(exports);
-    node::Script::Initialize(exports);
-    binding_cache->Set(module, exports);
   } else if (!strcmp(*module_v, "natives")) {
     exports = Object::New();
     // Explicitly define native sources.

diff --git a/src/node_extensions.h b/src/node_extensions.h
@@ -6,6 +6,7 @@ NODE_EXT_LIST_ITEM(node_child_process)
 #ifdef HAVE_OPENSSL
 NODE_EXT_LIST_ITEM(node_crypto)
 #endif
+NODE_EXT_LIST_ITEM(node_evals)
 NODE_EXT_LIST_ITEM(node_fs)
 NODE_EXT_LIST_ITEM(node_net)
 NODE_EXT_LIST_ITEM(node_http_parser)

diff --git a/src/node_script.cc b/src/node_script.cc
@@ -280,3 +280,12 @@ template <node::Script::EvalInputFlags iFlag,
 
   return result == args.This() ? result : scope.Close(result);
 }
+
+void node::InitEvals(Handle<Object> target) {
+  HandleScope scope;
+
+  node::Context::Initialize(target);
+  node::Script::Initialize(target);
+}
+
+NODE_MODULE(node_evals, node::InitEvals);
diff --git a/src/node_script.h b/src/node_script.h
@@ -57,5 +57,7 @@ class Script : ObjectWrap {
 };
 
 
+void InitEvals(v8::Handle<v8::Object> target);
+
 } // namespace node
 #endif //  node_script_h