fix bugs in namespacer for bullet

1 files changed, 11 insertions, 5 deletions

diff --git a/tools/namespacer.py b/tools/namespacer.py
index 008c2d00..8e4c5e8e 100644
--- a/tools/namespacer.py
+++ b/tools/namespacer.py
@@ -54,18 +54,24 @@ for line in data:
   for part in funcparts[:-1]:
     currspace = currspace.setdefault(part, {})
 
+  finalname = funcparts[-1]
   key = str(funcparts)
   if key in counts:
     i = counts[key]
     counts[key] += 1
-    funcparts[-1] += '_' + str(i)
+    finalname += '_' + str(i)
   else:
+    i = 0
     counts[key] = 1
-  currspace[funcparts[-1]] = realname
-  currspace[funcparts[-1] + '__params'] = params
+  currspace[finalname] = realname
+  currspace[finalname + '__params'] = params
   if len(funcparts) >= 2 and funcparts[-1] == funcparts[-2]:
-    currspace['__new__'] = 'function() { var ret = _malloc(_struct_%s___SIZE); Module._.%s.%s.apply(null, [ret].concat(Array.prototype.slice.apply(arguments))); return ret; }' % (
-      funcparts[-1], funcparts[-1], funcparts[-1]
+    size = '_struct_%s' % '__'.join(funcparts[:-1])
+    if len(funcparts) > 2:
+      size = '_' + size + '_'
+    size = size + '___SIZE'
+    currspace['__new__' + ('' if i == 0 else str(i))] = 'function() { var ret = _malloc(%s); Module._.%s.%s.apply(null, [ret].concat(Array.prototype.slice.apply(arguments))); return ret; }' % (
+      size, '.'.join(funcparts[:-1]), finalname
     )
 
 def finalize(line):