latest NODE_MODULE() form

rvagg · rvagg · commit 6d21379e25b4 · 2013-01-25T14:18:40.000+11:00
diff --git a/1_hello_world/hello.cc b/1_hello_world/hello.cc
@@ -8,10 +8,9 @@ Handle<Value> Method(const Arguments& args) {
   return scope.Close(String::New("world"));
 }
 
-void init(Handle<Object> target) {
-  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
-      String::NewSymbol("hello"),
+void init(Handle<Object> exports) {
+  exports->Set(String::NewSymbol("hello"),
       FunctionTemplate::New(Method)->GetFunction());
 }
 
-NODE_MODULE_M(hello, init)
+NODE_MODULE(hello, init)
diff --git a/2_function_arguments/addon.cc b/2_function_arguments/addon.cc
@@ -21,10 +21,9 @@ Handle<Value> Add(const Arguments& args) {
   return scope.Close(num);
 }
 
-void Init(Handle<Object> target) {
-  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
-      String::NewSymbol("add"),
+void Init(Handle<Object> exports) {
+  exports->Set(String::NewSymbol("add"),
       FunctionTemplate::New(Add)->GetFunction());
 }
 
-NODE_MODULE_M(addon, Init)
+NODE_MODULE(addon, Init)
diff --git a/3_callbacks/addon.cc b/3_callbacks/addon.cc
@@ -14,9 +14,9 @@ Handle<Value> RunCallback(const Arguments& args) {
   return scope.Close(Undefined());
 }
 
-void Init(Handle<Object> target) {
-  target->Set(String::NewSymbol("exports"),
+void Init(Handle<Object> exports, Handle<Object> module) {
+  module->Set(String::NewSymbol("exports"),
       FunctionTemplate::New(RunCallback)->GetFunction());
 }
 
-NODE_MODULE_M(addon, Init)
+NODE_MODULE(addon, Init)
diff --git a/4_object_factory/addon.cc b/4_object_factory/addon.cc
@@ -12,9 +12,9 @@ Handle<Value> CreateObject(const Arguments& args) {
   return scope.Close(obj);
 }
 
-void Init(Handle<Object> target) {
-  target->Set(String::NewSymbol("exports"),
+void Init(Handle<Object> exports, Handle<Object> module) {
+  module->Set(String::NewSymbol("exports"),
       FunctionTemplate::New(CreateObject)->GetFunction());
 }
 
-NODE_MODULE_M(addon, Init)
+NODE_MODULE(addon, Init)
diff --git a/5_function_factory/addon.cc b/5_function_factory/addon.cc
@@ -18,9 +18,9 @@ Handle<Value> CreateFunction(const Arguments& args) {
   return scope.Close(fn);
 }
 
-void Init(Handle<Object> target) {
-  target->Set(String::NewSymbol("exports"),
+void Init(Handle<Object> exports, Handle<Object> module) {
+  module->Set(String::NewSymbol("exports"),
       FunctionTemplate::New(CreateFunction)->GetFunction());
 }
 
-NODE_MODULE_M(addon, Init)
+NODE_MODULE(addon, Init)
diff --git a/6_object_wrap/addon.cc b/6_object_wrap/addon.cc
@@ -4,8 +4,8 @@
 
 using namespace v8;
 
-void InitAll(Handle<Object> target) {
-  MyObject::Init(target);
+void InitAll(Handle<Object> exports) {
+  MyObject::Init(exports);
 }
 
-NODE_MODULE_M(addon, InitAll)
+NODE_MODULE(addon, InitAll)
diff --git a/6_object_wrap/myobject.cc b/6_object_wrap/myobject.cc
@@ -17,9 +17,7 @@ void MyObject::Init(Handle<Object> target) {
       FunctionTemplate::New(PlusOne)->GetFunction());
 
   Persistent<Function> constructor = Persistent<Function>::New(tpl->GetFunction());
-  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
-      String::NewSymbol("MyObject"),
-      constructor);
+  target->Set(String::NewSymbol("MyObject"), constructor);
 }
 
 Handle<Value> MyObject::New(const Arguments& args) {
diff --git a/7_factory_wrap/addon.cc b/7_factory_wrap/addon.cc
@@ -9,11 +9,11 @@ Handle<Value> CreateObject(const Arguments& args) {
   return scope.Close(MyObject::NewInstance(args));
 }
 
-void InitAll(Handle<Object> target) {
+void InitAll(Handle<Object> exports, Handle<Object> module) {
   MyObject::Init();
 
-  target->Set(String::NewSymbol("exports"),
+  module->Set(String::NewSymbol("exports"),
       FunctionTemplate::New(CreateObject)->GetFunction());
 }
 
-NODE_MODULE_M(addon, InitAll)
+NODE_MODULE(addon, InitAll)
diff --git a/8_passing_wrapped/addon.cc b/8_passing_wrapped/addon.cc
@@ -21,16 +21,14 @@ Handle<Value> Add(const Arguments& args) {
   return scope.Close(Number::New(sum));
 }
 
-void InitAll(Handle<Object> target) {
+void InitAll(Handle<Object> exports) {
   MyObject::Init();
 
-  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
-      String::NewSymbol("createObject"),
+  exports->Set(String::NewSymbol("createObject"),
       FunctionTemplate::New(CreateObject)->GetFunction());
 
-  target->Get(String::NewSymbol("exports")).As<Object>()->Set(
-      String::NewSymbol("add"),
+  exports->Set(String::NewSymbol("add"),
       FunctionTemplate::New(Add)->GetFunction());
 }
 
-NODE_MODULE_M(addon, InitAll)
+NODE_MODULE(addon, InitAll)

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,9 @@ Handle<Value> Method(const Arguments& args) {`
`8`	`8`	`return scope.Close(String::New("world"));`
`9`	`9`	`}`
`10`	`10`
`11`		`-void init(Handle<Object> target) {`
`12`		`- target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`13`		`- String::NewSymbol("hello"),`
	`11`	`+void init(Handle<Object> exports) {`
	`12`	`+ exports->Set(String::NewSymbol("hello"),`
`14`	`13`	`FunctionTemplate::New(Method)->GetFunction());`
`15`	`14`	`}`
`16`	`15`
`17`		`-NODE_MODULE_M(hello, init)`
	`16`	`+NODE_MODULE(hello, init)`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,9 @@ Handle<Value> Add(const Arguments& args) {`
`21`	`21`	`return scope.Close(num);`
`22`	`22`	`}`
`23`	`23`
`24`		`-void Init(Handle<Object> target) {`
`25`		`- target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`26`		`- String::NewSymbol("add"),`
	`24`	`+void Init(Handle<Object> exports) {`
	`25`	`+ exports->Set(String::NewSymbol("add"),`
`27`	`26`	`FunctionTemplate::New(Add)->GetFunction());`
`28`	`27`	`}`
`29`	`28`
`30`		`-NODE_MODULE_M(addon, Init)`
	`29`	`+NODE_MODULE(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ Handle<Value> RunCallback(const Arguments& args) {`
`14`	`14`	`return scope.Close(Undefined());`
`15`	`15`	`}`
`16`	`16`
`17`		`-void Init(Handle<Object> target) {`
`18`		`- target->Set(String::NewSymbol("exports"),`
	`17`	`+void Init(Handle<Object> exports, Handle<Object> module) {`
	`18`	`+ module->Set(String::NewSymbol("exports"),`
`19`	`19`	`FunctionTemplate::New(RunCallback)->GetFunction());`
`20`	`20`	`}`
`21`	`21`
`22`		`-NODE_MODULE_M(addon, Init)`
	`22`	`+NODE_MODULE(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ Handle<Value> CreateObject(const Arguments& args) {`
`12`	`12`	`return scope.Close(obj);`
`13`	`13`	`}`
`14`	`14`
`15`		`-void Init(Handle<Object> target) {`
`16`		`- target->Set(String::NewSymbol("exports"),`
	`15`	`+void Init(Handle<Object> exports, Handle<Object> module) {`
	`16`	`+ module->Set(String::NewSymbol("exports"),`
`17`	`17`	`FunctionTemplate::New(CreateObject)->GetFunction());`
`18`	`18`	`}`
`19`	`19`
`20`		`-NODE_MODULE_M(addon, Init)`
	`20`	`+NODE_MODULE(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ Handle<Value> CreateFunction(const Arguments& args) {`
`18`	`18`	`return scope.Close(fn);`
`19`	`19`	`}`
`20`	`20`
`21`		`-void Init(Handle<Object> target) {`
`22`		`- target->Set(String::NewSymbol("exports"),`
	`21`	`+void Init(Handle<Object> exports, Handle<Object> module) {`
	`22`	`+ module->Set(String::NewSymbol("exports"),`
`23`	`23`	`FunctionTemplate::New(CreateFunction)->GetFunction());`
`24`	`24`	`}`
`25`	`25`
`26`		`-NODE_MODULE_M(addon, Init)`
	`26`	`+NODE_MODULE(addon, Init)`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`using namespace v8;`
`6`	`6`
`7`		`-void InitAll(Handle<Object> target) {`
`8`		`- MyObject::Init(target);`
	`7`	`+void InitAll(Handle<Object> exports) {`
	`8`	`+ MyObject::Init(exports);`
`9`	`9`	`}`
`10`	`10`
`11`		`-NODE_MODULE_M(addon, InitAll)`
	`11`	`+NODE_MODULE(addon, InitAll)`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,7 @@ void MyObject::Init(Handle<Object> target) {`
`17`	`17`	`FunctionTemplate::New(PlusOne)->GetFunction());`
`18`	`18`
`19`	`19`	`Persistent<Function> constructor = Persistent<Function>::New(tpl->GetFunction());`
`20`		`- target->Get(String::NewSymbol("exports")).As<Object>()->Set(`
`21`		`- String::NewSymbol("MyObject"),`
`22`		`- constructor);`
	`20`	`+ target->Set(String::NewSymbol("MyObject"), constructor);`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`Handle<Value> MyObject::New(const Arguments& args) {`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ Handle<Value> CreateObject(const Arguments& args) {`
`9`	`9`	`return scope.Close(MyObject::NewInstance(args));`
`10`	`10`	`}`
`11`	`11`
`12`		`-void InitAll(Handle<Object> target) {`
	`12`	`+void InitAll(Handle<Object> exports, Handle<Object> module) {`
`13`	`13`	`MyObject::Init();`
`14`	`14`
`15`		`- target->Set(String::NewSymbol("exports"),`
	`15`	`+ module->Set(String::NewSymbol("exports"),`
`16`	`16`	`FunctionTemplate::New(CreateObject)->GetFunction());`
`17`	`17`	`}`
`18`	`18`
`19`		`-NODE_MODULE_M(addon, InitAll)`
	`19`	`+NODE_MODULE(addon, InitAll)`