From d18c4d0c73ec7b77dd03b9baa7ae24e8648f94ca Mon Sep 17 00:00:00 2001
From: Tshine <gtshine@gmail.com>
Date: Sat, 5 Nov 2016 18:53:38 +0800
Subject: [PATCH] Update generator.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 rename_functions中如果有skip中的"方法名"时，会把rename后的方法也跳过，现在修改为，skip后，再rename
---
 generator.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/generator.py b/generator.py
index e63c7e11..c8d73d29 100755
--- a/generator.py
+++ b/generator.py
@@ -763,6 +763,7 @@ def methods_clean(self):
                 if self.generator.should_skip(self.class_name, name):
                     should_skip = True
             if not should_skip:
+                name = self.generator.should_rename_function(self.class_name, name) or name
                 ret.append({"name": name, "impl": impl})
         return ret
 
@@ -774,6 +775,7 @@ def static_methods_clean(self):
         for name, impl in self.static_methods.iteritems():
             should_skip = self.generator.should_skip(self.class_name, name)
             if not should_skip:
+                name = self.generator.should_rename_function(self.class_name, name) or name
                 ret.append({"name": name, "impl": impl})
         return ret
 
@@ -785,6 +787,7 @@ def override_methods_clean(self):
         for name, impl in self.override_methods.iteritems():
             should_skip = self.generator.should_skip(self.class_name, name)
             if not should_skip:
+                name = self.generator.should_rename_function(self.class_name, name) or name
                 ret.append({"name": name, "impl": impl})
         return ret
 
@@ -908,7 +911,7 @@ def _process_node(self, cursor):
             # skip if variadic
             if self._current_visibility == cindex.AccessSpecifierKind.PUBLIC and not cursor.type.is_function_variadic():
                 m = NativeFunction(cursor)
-                registration_name = self.generator.should_rename_function(self.class_name, m.func_name) or m.func_name
+                registration_name = m.func_name
                 # bail if the function is not supported (at least one arg not supported)
                 if m.not_supported:
                     return False