More multi-version support (part 2)

ppapi/generators/idl_c_proto.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Generator for C style prototypes and definitions """
 
 import glob
 import os
@@ skipping 380 matching lines @@
       out = '%s\n%s\n} %s;\n' % (out, ',\n'.join(enumlist), name)
     return out
 
   def DefineMember(self, node, releases, prefix='', comment=False):
     release = releases[0]
     self.LogEnter('DefineMember %s' % node)
     out = '%s;' % self.GetSignature(node, release, 'store', '', True)
     self.LogExit('Exit DefineMember')
     return out
 
-  # Define a Struct.
-  def DefineStruct(self, node, releases, prefix='', comment=False):
+  def DefineStructInternals(self, node, release, suffix='', comment=True):
     out = ''
-
-    self.LogEnter('DefineStruct %s' % node)
     if node.GetProperty('union'):
-      out += 'union %s%s {\n' % (prefix, node.GetName())
+      out += 'union %s%s {\n' % (node.GetName(), suffix)
     else:
-      out += 'struct %s%s {\n' % (prefix, node.GetName())
+      out += 'struct %s%s {\n' % (node.GetName(), suffix)
 
     # Generate Member Functions
     members = []
     for child in node.GetListOf('Member'):
-      member = self.Define(child, releases, tabs=1, comment=comment)
+      member = self.Define(child, [release], tabs=1, comment=comment)
       if not member:
         continue
       members.append(member)
     out += '%s\n};\n' % '\n'.join(members)
+    return out
+
+
+  def DefineStruct(self, node, releases, prefix='', comment=False):
+    self.LogEnter('DefineStruct %s' % node)
+    out = ''
+    build_list = node.GetUniqueReleases(releases)
+
+    # Build the most recent one with comments
+    out = self.DefineStructInternals(node, build_list[-1], comment=True)
+
+    # Build the rest without comments and with the version number appended
+    for rel in build_list[0:-1]:
+      ver_num = node.GetVersion(rel)
+      ver = ("_%s" % ver_num).replace('.', '_')
+      out += '\n' + self.DefineStructInternals(node, rel, suffix=ver,
+                                               comment=False)
+
     self.LogExit('Exit DefineStruct')
     return out
 
+
   #
   # Copyright and Comment
   #
   # Generate a comment or copyright block
   #
   def Copyright(self, node, tabs=0):
     lines = node.GetName().split('\n')
     return CommentLines(lines, tabs)
 
 
@@ skipping 113 matching lines @@
       print 'Skipping %s' % f.GetName()
       continue
     print DefineDepends(node)
     for node in f.GetChildren()[2:]:
       print Define(node, comment=True, prefix='tst_')
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))