Merge pull request #423 from nodegit/fix-save-props-part-deux

johnhaley81 · johnhaley81 · commit 408d9048487f · 2015-02-24T11:42:34.000-07:00
Clean up the persisting of props
diff --git a/generate/templates/partials/sync_function.cc b/generate/templates/partials/sync_function.cc
@@ -19,16 +19,12 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
           {%if not arg.payloadFor %}
             {%partial convertFromV8 arg %}
             {%if arg.saveArg %}
-  Persistent<Object> {{ arg.name }};
-  Handle<Object> {{ arg.name }}Handle(args[{{ arg.jsArg }}]->ToObject());
-  NanAssignPersistent({{ arg.name }}, {{ arg.name }}Handle);
+  Handle<Object> {{ arg.name }}(args[{{ arg.jsArg }}]->ToObject());
   {{ cppClassName }} *thisObj = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This());
 
-  if (thisObj->{{ cppFunctionName }}_{{ arg.name }} != NULL) {
-    NanDisposePersistent(*thisObj->{{ cppFunctionName }}_{{ arg.name }});
-  }
+  NanDisposePersistent(thisObj->{{ cppFunctionName }}_{{ arg.name }});
 
-  thisObj->{{ cppFunctionName }}_{{ arg.name }} = &{{ arg.name }};
+  NanAssignPersistent(thisObj->{{ cppFunctionName }}_{{ arg.name }}, {{ arg.name }});
             {%endif%}
           {%endif%}
         {%endif%}
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -29,16 +29,6 @@ using namespace node;
   {{ cppClassName }}::{{ cppClassName }}({{ cType }} *raw, bool selfFreeing) {
     this->raw = raw;
     this->selfFreeing = selfFreeing;
-
-    {% each functions as function %}
-      {% if not function.ignore %}
-        {% each function.args as arg %}
-          {% if arg.saveArg %}
-    {{ function.cppFunctionName }}_{{ arg.name }} = NULL;
-          {% endif %}
-        {% endeach %}
-      {% endif %}
-    {% endeach %}
   }
 
   {{ cppClassName }}::~{{ cppClassName }}() {
@@ -51,17 +41,18 @@ using namespace node;
     // this will cause an error if you have a non-self-freeing object that also needs
     // to save values. Since the object that will eventually free the object has no
     // way of knowing to free these values.
-    {% each function as function %}
+    {% each functions as function %}
       {% if not function.ignore %}
         {% each function.args as arg %}
           {% if arg.saveArg %}
-    if ({{ function.cppFunctionName }}_{{ arg.name }} != NULL) {
-      NanDisposePersistent(&{{ function.cppFunctionName }}_{{ arg.name }});
-    }
+
+      NanDisposePersistent({{ function.cppFunctionName }}_{{ arg.name }});
+
           {% endif %}
         {% endeach %}
       {% endif %}
     {% endeach %}
+
   }
 
   void {{ cppClassName }}::InitializeComponent(Handle<v8::Object> target) {
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
@@ -87,7 +87,7 @@ class {{ cppClassName }} : public ObjectWrap {
       {% if not function.ignore %}
         {% each function.args as arg %}
           {% if arg.saveArg %}
-    Persistent<Object> *{{ function.cppFunctionName }}_{{ arg.name }};
+    Persistent<Object> {{ function.cppFunctionName }}_{{ arg.name }};
           {% endif %}
         {% endeach %}
       {% endif %}
