Objects can now store enums/structs and opaque structs

John Haley · tbranyen · commit 2bf45b3edfd2 · 2014-10-23T10:47:33.000-04:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -162,7 +162,6 @@
   "clone_options": {
     "cType": "git_clone_options",
     "isStruct": true,
-    "isPublicStruct": true,
     "dependencies": [
       "../include/checkout_options.h",
       "../include/remote_callbacks.h"
diff --git a/generate/index.js b/generate/index.js
@@ -92,7 +92,7 @@ fse.remove(path.resolve(__dirname, "../src")).then(function() {
 
   // Write out all the classes.
   enabled.forEach(function(idef) {
-    if (idef.isPublicStruct) {
+    if (idef.hasConstructor) {
       file.write("../src/" + idef.name + ".cc", templates.struct_content.render(idef));
       file.write("../include/" + idef.name + ".h", templates.struct_header.render(idef));
     }
diff --git a/generate/partials/field_accessors.cc b/generate/partials/field_accessors.cc
@@ -6,7 +6,9 @@ NAN_GETTER({{ cppClassName }}::Get{{ field.cppFunctionName }}) {
 
   {{ cType }} *raw = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue();
 
-  {%if field.cppClassName == 'String' %}
+  {%if field.hasConstructor %}
+  NanReturnValue(NanNew(new {{ field.cppClassName }}(&raw->{{ field.name }})));
+  {%elsif field.cppClassName == 'String' %}
   NanReturnValue(NanNew<String>(raw->{{ field.name }}));
   {%elsif field.cppClassName|isV8Value %}
   NanReturnValue(NanNew<{{ field.cppClassName }}>(raw->{{ field.name }}));
@@ -19,7 +21,10 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
 
   {{ cType }} *raw = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue();
 
-  {%if field.cppClassName == 'String' %}
+  {%if field.hasConstructor %}
+  {{ field.cType }}* wrappedStruct = ObjectWrap::Unwrap<{{ field.cppClassName }}>(value->ToObject())->GetValue();
+  memcpy(&raw->{{ field.name }}, wrappedStruct, sizeof({{ field.cType }}));
+  {%elsif field.cppClassName == 'String' %}
   if (raw->{{ field.name }}) {
     //free(raw->{{ field.name }});
   }
@@ -28,14 +33,12 @@ NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) {
   raw->{{ field.name }} = strdup(*str);
   {%elsif field.isCppClassIntType%}
   if (value->IsNumber()) {
-    raw->{{ field.name }} = value->field.cppClassName}}Value();
+    raw->{{ field.name }} = value->{{field.cppClassName}}Value();
   }
-  {%elsif field.cppClassName == 'Number' %}
+  {%else%}
   if (value->IsNumber()) {
-    raw->{{ field.name }} = value->Int32Value();
+    raw->{{ field.name }} = ({{ field.cType }}) value->Int32Value();
   }
-  {%else%}
-  raw->{{ field.name }} = ({{ field.cType }}) value;
   {%endif%}
 
 }
diff --git a/generate/setup.js b/generate/setup.js
@@ -124,6 +124,18 @@ fileNames.forEach(function(fileName, index) {
     cFile.fields = descriptor[fileName].fields || structFile.fields || [];
   }
 
+  // This should turn 'git_clone_options' into 'git_clone_init_options'
+  var initFnName = ["git"].concat(fileName.split('_'));
+
+  initFnName.splice(-1, 0, "init");
+  initFnName = initFnName.join('_');
+
+  // Does this struct contain an init function? If so then we can create one publicly
+  // to pass into functions and other structs
+  file.hasConstructor = structFile.used && structFile.used.needs.some(function (fnName) {
+    return fnName === initFnName;
+  });
+
   // Doesn't actually exist.
   if (cFile.functions.indexOf(file.freeFunctionName) === -1) {
     delete file.freeFunctionName;
@@ -190,6 +202,22 @@ fileNames.forEach(function(fileName, index) {
       field.jsFunctionName = camelCase(field.name);
       field.cppClassName = typeMap[field.cType].cpp;
       field.jsClassName = typeMap[field.cType].js;
+
+      var struct = structs[field.cType];
+
+      // This should turn 'git_clone_options' into 'git_clone_init_options'
+      var initFnName = field.cType.split('_');
+
+      initFnName.splice(-1, 0, "init");
+      initFnName = initFnName.join('_');
+
+      // Does this struct contain an init function? If so then we can create one publicly
+      // to pass into functions and other structs
+      field.hasConstructor = struct && struct.used && struct.used.needs.some(function (fnName) {
+        return fnName === initFnName;
+      });
+
+      field.isEnum = struct && struct.type === "enum";
     } catch (ex) {
       console.error(file.filename, field.cType + " is missing a definition.");
     }
diff --git a/generate/templates/struct_content.cc b/generate/templates/struct_content.cc
@@ -22,6 +22,12 @@ using namespace node;
   memcpy(this->raw, &wrappedValue, sizeof({{ cType }}));
 }
 
+{{ cppClassName }}::{{ cppClassName }}({{ cType }}* raw) {
+  {{ cType }} wrappedValue = *raw;
+  this->raw = ({{ cType }}*) malloc(sizeof({{ cType }}));
+  memcpy(this->raw, &wrappedValue, sizeof({{ cType }}));
+}
+
 {{ cppClassName }}::~{{ cppClassName }}() {
   // This is going to cause memory leaks. We'll have to solve that later
   // TODO: Clean up memory better
diff --git a/generate/templates/struct_header.h b/generate/templates/struct_header.h
@@ -17,7 +17,7 @@ using namespace v8;
 
 class {{ cppClassName }} : public ObjectWrap {
   public:
-
+    {{ cppClassName }}({{ cType }}* raw);
     static Persistent<Function> constructor_template;
     static void Initialize (Handle<v8::Object> target);
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ fse.remove(path.resolve(__dirname, "../src")).then(function() {`
`92`	`92`
`93`	`93`	`// Write out all the classes.`
`94`	`94`	`enabled.forEach(function(idef) {`
`95`		`- if (idef.isPublicStruct) {`
	`95`	`+ if (idef.hasConstructor) {`
`96`	`96`	`file.write("../src/" + idef.name + ".cc", templates.struct_content.render(idef));`
`97`	`97`	`file.write("../include/" + idef.name + ".h", templates.struct_header.render(idef));`
`98`	`98`	`}`