[Telepathy-commits] [telepathy-glib/master] gtypes-generator: rename need_arrays to need_struct_arrays

[Simon McVittie]

This will hopefully reduce confusion when I add other sorts of
array.

Also document what goes in each mapping.
---
 tools/glib-gtypes-generator.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index fcb46e8..d784f6e 100644
--- a/tools/glib-gtypes-generator.py
+++ b/tools/glib-gtypes-generator.py
@@ -51,9 +51,14 @@ class GTypesGenerator(object):
                     ' * as the specification from which it was generated.\n'
                     ' */\n\n')
 
+        # keys are e.g. 'sv', values are the key escaped
         self.need_mappings = {}
+        # keys are the contents of the struct (e.g. 'sssu'), values are the
+        # key escaped
         self.need_structs = {}
-        self.need_arrays = {}
+        # keys are the contents of the struct (e.g. 'sssu'), values are the
+        # key escaped
+        self.need_struct_arrays = {}
 
     def do_mapping_header(self, mapping):
         members = mapping.getElementsByTagNameNS(NS_TP, 'member')
@@ -164,7 +169,7 @@ class GTypesGenerator(object):
             self.header.write(' * of #%s.\n' % name)
             self.header.write(' */\n')
             self.header.write('#define %s (%s ())\n\n' % (array_name, impl))
-            self.need_arrays[impl_sig] = esc_impl_sig
+            self.need_struct_arrays[impl_sig] = esc_impl_sig
 
         self.need_structs[impl_sig] = esc_impl_sig
 
@@ -209,16 +214,16 @@ class GTypesGenerator(object):
             self.body.write('  return t;\n')
             self.body.write('}\n\n')
 
-        for sig in self.need_arrays:
+        for sig in self.need_struct_arrays:
             self.header.write('GType %stype_dbus_array_%s (void);\n\n' %
-                              (self.prefix_, self.need_structs[sig]))
+                              (self.prefix_, self.need_struct_arrays[sig]))
             self.body.write('GType\n%stype_dbus_array_%s (void)\n{\n' %
-                              (self.prefix_, self.need_structs[sig]))
+                              (self.prefix_, self.need_struct_arrays[sig]))
             self.body.write('  static GType t = 0;\n\n')
             self.body.write('  if (G_UNLIKELY (t == 0))\n')
             self.body.write('    t = dbus_g_type_get_collection ("GPtrArray", '
                             '%stype_dbus_struct_%s ());\n' %
-                            (self.prefix_, self.need_structs[sig]))
+                            (self.prefix_, self.need_struct_arrays[sig]))
             self.body.write('  return t;\n')
             self.body.write('}\n\n')
 
-- 
1.5.6.5