Payloads no longer need to be named payload

John Haley · John Haley · commit 22804cbe141f · 2015-02-12T10:55:52.000-07:00
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -60,6 +60,7 @@ module.exports = function generateNativeCode() {
     isDoublePointer: require("../templates/filters/is_double_pointer"),
     isFixedLengthString: require("../templates/filters/is_fixed_length_string"),
     isOid: require("../templates/filters/is_oid"),
+    isPayload: require("../templates/filters/is_payload"),
     isPointer: require("../templates/filters/is_pointer"),
     isV8Value: require("../templates/filters/is_v8_value"),
     jsArgsCount: require("../templates/filters/js_args_count"),
diff --git a/generate/templates/filters/is_payload.js b/generate/templates/filters/is_payload.js
@@ -0,0 +1,3 @@
+module.exports = function(field) {
+  return field.name == 'payload' || field.payload;
+};
diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
@@ -40,11 +40,15 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(
 
   {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton* baton = static_cast<{{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton*>(req->data);
 
-  NanCallback* callback = (NanCallback *)baton->payload;
+  {% each cbFunction.args|argsInfo as arg %}
+    {% if arg | isPayload %}
+  NanCallback* callback = (NanCallback *)baton->{{ arg.name }};
+    {% endif %}
+  {% endeach %}
 
   Local<Value> argv[{{ cbFunction.args|jsArgsCount }}] = {
     {% each cbFunction.args|argsInfo as arg %}
-      {% if arg.name == "payload" %}
+      {% if arg | isPayload %}
         {%-- payload is always the last arg --%}
         // payload is null because we can use closure scope in javascript
         NanUndefined()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(field) {`
	`2`	`+ return field.name == 'payload' \|\| field.payload;`
	`3`	`+};`