Pepper: More IDL generator cleanup.

ppapi/generators/idl_c_proto.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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
 import sys
@@ skipping 550 matching lines @@
     __pychecker__ = 'unusednames=comment,prefix'
     self.LogEnter('DefineStruct %s' % node)
     out = ''
     build_list = node.GetUniqueReleases(releases)
 
     # TODO(noelallen) : Bug 157017 finish multiversion support
     if node.IsA('Struct'):
       if len(build_list) != 1:
         node.Error('Can not support multiple versions of node.')
       assert len(build_list) == 1
-
+      out = self.DefineStructInternals(node, build_list[-1],
+                                       include_version=False, comment=True)
 
     if node.IsA('Interface'):
       # Build the most recent one versioned, with comments
       out = self.DefineStructInternals(node, build_list[-1],
                                        include_version=True, comment=True)
-
       # Define an unversioned typedef for the most recent version
       out += '\ntypedef struct %s %s;\n' % (
           self.GetStructName(node, build_list[-1], include_version=True),
           self.GetStructName(node, build_list[-1], include_version=False))
-    else:
-      # Build the most recent one versioned, with comments
-      out = self.DefineStructInternals(node, build_list[-1],
-                                       include_version=False, comment=True)
-
-
-    # Build the rest without comments and with the version number appended
-    for rel in build_list[0:-1]:
-      out += '\n' + self.DefineStructInternals(node, rel,
-                                               include_version=True,
-                                               comment=False)
+      # Build the rest without comments and with the version number appended
+      for rel in build_list[0:-1]:
+        out += '\n' + self.DefineStructInternals(node, rel,
+                                                 include_version=True,
+                                                 comment=False)
 
     self.LogExit('Exit DefineStruct')
     return out
 
 
   #
   # Copyright and Comment
   #
   # Generate a comment or copyright block
   #
@@ skipping 142 matching lines @@
   filenames = ParseOptions(args)
   if GetOption('test'):
     return TestFiles(filenames)
   ast = ParseFiles(filenames)
   cgen = CGen()
   for f in ast.GetListOf('File'):
     if f.GetProperty('ERRORS') > 0:
       print 'Skipping %s' % f.GetName()
       continue
     for node in f.GetChildren()[2:]:
-      print cgen.Define(node, comment=True, prefix='tst_')
+      print cgen.Define(node, ast.releases, comment=True, prefix='tst_')
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))