add a colision handler for method names

maxkorp · maxkorp · commit c164cf21a0c3 · 2014-11-12T10:40:01.000-07:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -986,9 +986,7 @@
         "ignore": true
       },
       "git_revwalk_new": {
-        "isAsync": false,
-        "jsFunctionName": "createRevwalk",
-        "cppFunctionName": "CreateRevwalk"
+        "isAsync": false
       }
     }
   },
diff --git a/generate/utils.js b/generate/utils.js
@@ -23,6 +23,10 @@ var cTypeMappings = {
   "uint64_t": "Number"
 }
 
+var collisionMappings = {
+  "new": "create"
+}
+
 var Utils = {
   titleCase: function(str) {
     return str.split(/_|\//).map(function(val, index) {
@@ -318,6 +322,16 @@ var Utils = {
       Utils.decorateArg(fnDef.return, classDef, fnDef, fnOverrides.return || {});
     }
 
+    _(collisionMappings).forEach(function(newName, collidingName) {
+      if (fnDef.cppFunctionName == Utils.titleCase(collidingName)) {
+        fnDef.cppFunctionName = Utils.titleCase(newName);
+      }
+
+      if (fnDef.jsFunctionName == Utils.camelCase(collidingName)) {
+        fnDef.jsFunctionName = Utils.camelCase(newName);
+      }
+    });
+
     _.merge(fnDef, _.omit(fnOverrides, "args", "return"));
   },
 
diff --git a/lib/repository.js b/lib/repository.js
@@ -183,7 +183,7 @@ Repository.prototype.getTag = function(oid, callback) {
  * @return {RevWalk}
  */
 Repository.prototype.createRevWalk = function() {
-  var revWalk = Revwalk.createRevwalk(this);
+  var revWalk = Revwalk.create(this);
   revWalk.repo = this;
   return revWalk;
 };

Original file line number	Diff line number	Diff line change
`@@ -986,9 +986,7 @@`
`986`	`986`	`"ignore": true`
`987`	`987`	`},`
`988`	`988`	`"git_revwalk_new": {`
`989`		`- "isAsync": false,`
`990`		`- "jsFunctionName": "createRevwalk",`
`991`		`- "cppFunctionName": "CreateRevwalk"`
	`989`	`+ "isAsync": false`
`992`	`990`	`}`
`993`	`991`	`}`
`994`	`992`	`},`