More work.

tbranyen · tbranyen · commit 135104e287a8 · 2014-05-08T00:12:23.000-04:00
diff --git a/build/codegen/t.js b/build/codegen/t.js
@@ -119,7 +119,6 @@ Object.keys(descriptor).forEach(function(fileName, index) {
     return "../include/" + file + ".h"; 
   });
 
-  /*
 
   // Add to the type's list if it's new.
   typeMap["const " + "git_" + fileName + " *"] =
@@ -134,14 +133,19 @@ Object.keys(descriptor).forEach(function(fileName, index) {
   file.functions = libgit2.files[index].functions.map(function(functionName, index) {
     var funcDescriptor = libgit2.functions[functionName];
     var descriptor = legacyFile.functions ? legacyFile.functions[index] || {} : {};
-    var cType = file.cType || "";
+    var cType = file.cType || "git";
 
     if (!functionName || !funcDescriptor) { return; }
 
     descriptor.cFunctionName = functionName;
+    descriptor.ignore = true;
 
     var trimmedName = functionName.slice(cType.length + 1);
 
+    if (trimmedName === "new") {
+      trimmedName = "new2";
+    }
+
     descriptor.cppFunctionName = titleCase(trimmedName);
     descriptor.jsFunctionName = camelCase(trimmedName);
 
@@ -154,9 +158,9 @@ Object.keys(descriptor).forEach(function(fileName, index) {
     };
 
     var retVal = descriptor.return = {};
-    retVal.ctype = funcDescriptor.return.type;
+    retVal.cType = funcDescriptor.return.type;
 
-    var type = typeMap[retVal.ctype];
+    var type = typeMap[retVal.cType];
     retVal.cppClassName = type.cpp;
     retVal.jsClassName = type.js;
 
@@ -185,9 +189,11 @@ Object.keys(descriptor).forEach(function(fileName, index) {
     return descriptor;
   });
 
-  */
   files.push(file);
 });
 
+fs.writeFileSync(path.join(__dirname, "types.json"), 
+  JSON.stringify(typeMap, null, 2));
+
 fs.writeFileSync(path.join(__dirname, "compare.json"), 
   JSON.stringify(files, null, 2));
diff --git a/build/codegen/templates/convertFromV8.cc.ejs b/build/codegen/templates/convertFromV8.cc.ejs
@@ -5,7 +5,7 @@
   <% } -%>
     <% if (arg.cppClassName == 'String') { -%>
       String::Utf8Value <%- arg.name %>(args[<%- jsArg %>]->ToString());
-      from_<%- arg.name %> = strdup(*<%- arg.name %>);
+      from_<%- arg.name %> = (<%- arg.cType %>) strdup(*<%- arg.name %>);
     <% } else if (arg.cppClassName == 'Array') { -%>
       Array *tmp_<%- arg.name %> = Array::Cast(*args[<%- jsArg %>]);
       from_<%- arg.name %> = (<%- arg.cType %>)malloc(tmp_<%- arg.name %>->Length() * sizeof(<%- arg.cType.replace('**', '*') %>));
diff --git a/build/codegen/tmp.js b/build/codegen/tmp.js
@@ -1,27 +1,45 @@
-n = require("./new.json")
+//n = require("./new.json")
+//
+//lookup = {}
+//
+//n.forEach(function(a) {
+//  a.functions = a.functions || []
+//  a.functions.forEach(function(b) {
+//    lookup[b.cFunctionName] = {
+//      js: b.jsFunctionName,
+//      cpp: b.cppFunctionName
+//    }
+//
+//    b.args.forEach(function(c) {
+//      lookup[c.cType] = {
+//        js: c.jsClassName,
+//        cpp: c.cppClassName
+//      };
+//    })
+//
+//    lookup[b.return.cType] = {
+//      js: b.return.cppClassName,
+//      cpp: b.return.jsClassName
+//    }
+//  })
+//})
+//
+//console.log(JSON.stringify(lookup, null, 2))
+//
 
-lookup = {}
+types = require("./types.json");
+fs = require("fs");
 
-n.forEach(function(a) {
-  a.functions = a.functions || []
-  a.functions.forEach(function(b) {
-    lookup[b.cFunctionName] = {
-      js: b.jsFunctionName,
-      cpp: b.cppFunctionName
-    }
+Object.keys(types).forEach(function(typeName) {
+  var type = types[typeName];
 
-    b.args.forEach(function(c) {
-      lookup[c.cType] = {
-        js: c.jsClassName,
-        cpp: c.cppClassName
-      };
-    })
+  if (!type.cpp) { return; }
 
-    lookup[b.return.cType] = {
-      js: b.return.cppClassName,
-      cpp: b.return.jsClassName
+  if (type.cpp.indexOf("Git") === -1) {
+    if (type.cpp[0] === type.cpp[0].toUpperCase()) {
+      type.cpp = "Git" + type.cpp;
     }
-  })
-})
+  }
+});
 
-console.log(JSON.stringify(lookup, null, 2))
+fs.writeFileSync("./types.json", JSON.stringify(types, null, 2));
