Add ClearValue method to structs and classes

John Haley · John Haley · commit 7eb2108c06f7 · 2015-02-25T17:17:02.000-07:00
diff --git a/generate/templates/partials/sync_function.cc b/generate/templates/partials/sync_function.cc
@@ -74,8 +74,7 @@ from_{{ arg.name }}
 {%endif%}
 
 {% if cppFunctionName == "Free" %}
-// FIXME Stuck here unable to NULL out this->repo
-// ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->SetValue(NULL);
+  ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->ClearValue();
 }
 {% endif %}
 
diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc
@@ -113,7 +113,11 @@ using namespace node;
   }
 
   {{ cType }} **{{ cppClassName }}::GetRefValue() {
-    return &this->raw;
+    return this->raw == NULL ? NULL : &this->raw;
+  }
+
+  void {{ cppClassName }}::ClearValue() {
+    this->raw = NULL;
   }
 
 {% else %}
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
@@ -38,6 +38,7 @@ class {{ cppClassName }} : public ObjectWrap {
     {%if cType%}
     {{ cType }} *GetValue();
     {{ cType }} **GetRefValue();
+    void ClearValue();
 
     static Handle<v8::Value> New(void *raw, bool selfFreeing);
     {%endif%}
diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc
@@ -138,7 +138,11 @@ Handle<v8::Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {
 }
 
 {{ cType }} **{{ cppClassName }}::GetRefValue() {
-  return &this->raw;
+  return this->raw == NULL ? NULL : &this->raw;
+}
+
+void {{ cppClassName }}::ClearValue() {
+  this->raw = NULL;
 }
 
 {% partial fieldAccessors . %}
diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h
@@ -26,6 +26,7 @@ class {{ cppClassName }} : public ObjectWrap {
 
     {{ cType }} *GetValue();
     {{ cType }} **GetRefValue();
+    void ClearValue();
 
     static Handle<v8::Value> New(void *raw, bool selfFreeing);
 

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ from_{{ arg.name }}`
`74`	`74`	`{%endif%}`
`75`	`75`
`76`	`76`	`{% if cppFunctionName == "Free" %}`
`77`		`-// FIXME Stuck here unable to NULL out this->repo`
`78`		`-// ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->SetValue(NULL);`
	`77`	`+ ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->ClearValue();`
`79`	`78`	`}`
`80`	`79`	`{% endif %}`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,11 @@ using namespace node;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`{{ cType }} **{{ cppClassName }}::GetRefValue() {`
`116`		`- return &this->raw;`
	`116`	`+ return this->raw == NULL ? NULL : &this->raw;`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ void {{ cppClassName }}::ClearValue() {`
	`120`	`+ this->raw = NULL;`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`{% else %}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,11 @@ Handle<v8::Value> {{ cppClassName }}::New(void* raw, bool selfFreeing) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`{{ cType }} **{{ cppClassName }}::GetRefValue() {`
`141`		`- return &this->raw;`
	`141`	`+ return this->raw == NULL ? NULL : &this->raw;`
	`142`	`+}`
	`143`	`+`
	`144`	`+void {{ cppClassName }}::ClearValue() {`
	`145`	`+ this->raw = NULL;`
`142`	`146`	`}`
`143`	`147`
`144`	`148`	`{% partial fieldAccessors . %}`