Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed field_accessors template
  • Loading branch information
Carson Howard authored and mohseenrm committed Jul 25, 2017
commit 718e101eb2d1f6166963b422b406c97e945cb2e7
1 change: 0 additions & 1 deletion generate/templates/partials/async_function.cc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
{%elsif arg.shouldAlloc %}
{%if arg.cppClassName == "GitBuf" %}
{%else%}
// culprit found
baton->{{ arg.name }} = ({{ arg.cType }})malloc(sizeof({{ arg.cType|replace '*' '' }}));
{%endif%}
{%endif%}
Expand Down
21 changes: 15 additions & 6 deletions generate/templates/partials/field_accessors.cc
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@
{% if not arg.firstArg %}
{% if field.args|jsArgsCount|subtract 1|or 0 %}
{% if arg.cppClassName == "String" %}
src,
{%-- src is always the last arg --%}
src
{% elsif arg.isJsArg %}
{% if arg.isEnum %}
Nan::New((int)baton->{{ arg.name }}),
Expand All @@ -224,15 +225,17 @@
{% elsif arg.cType == "size_t" %}
Nan::New((unsigned int)baton->{{ arg.name }}),
{% elsif arg.name == "payload" %}
{%-- skip, filters should not have a payload --%}
{% else %}
Nan::New(baton->{{ arg.name }}),
{% endif %}
{% endif %}
{% endif %}
{% endif %}
{% else %}
{% if arg.cppClassName == "String" %}
Nan::New(baton->{{ arg.name }}).ToLocalChecked(),
{% if arg.name == "payload" %}
{%-- payload is always the last arg --%}
Nan::New(instance->{{ fields|payloadFor field.name }})
{% elsif arg.isJsArg %}
{% if arg.isEnum %}
Nan::New((int)baton->{{ arg.name }}),
Expand All @@ -241,7 +244,8 @@
{% elsif arg.cType == "size_t" %}
// HACK: NAN should really have an overload for Nan::New to support size_t
Nan::New((unsigned int)baton->{{ arg.name }}),
{% elsif arg.name == "payload" %}
{% elsif arg.cppClassName == "String" %}
Nan::New(baton->{{ arg.name }}).ToLocalChecked(),
{% else %}
Nan::New(baton->{{ arg.name }}),
{% endif %}
Expand All @@ -255,12 +259,17 @@
{% endif %}

Nan::TryCatch tryCatch;
v8::Local<v8::Value> result = instance->{{ field.name }}.GetCallback()->Call({{ field.args|jsArgsCount|subtract 2| setUnsigned }}, argv);

{% if field.isSelfReferential %}
v8::Local<v8::Value> result = instance->{{ field.name }}.GetCallback()->Call({{ field.args|jsArgsCount|subtract 2| setUnsigned }}, argv);
{% else %}
v8::Local<v8::Value> result = instance->{{ field.name }}.GetCallback()->Call({{ field.args|jsArgsCount }}, argv);
{% endif %}

if(PromiseCompletion::ForwardIfPromise(result, baton, {{ cppClassName }}::{{ field.name }}_promiseCompleted)) {
return;
}
//TODO: fix for void cases

{% if field.return.type == "void" %}
baton->Done();
{% else %}
Expand Down