Change the way we generate versions

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 77 matching lines @@
       'store': '%s',
       'return': '%s'
     },
     'Enum': {
       'in': '%s',
       'inout': '%s*',
       'out': '%s*',
       'store': '%s',
       'return': '%s'
     },
+    'Interface': {
+      'in': 'const %s*',
+      'inout': '%s*',
+      'out': '%s**',
+      'return': '%s*',
+      'store': '%s*'
+    },
     'Struct': {
       'in': 'const %s*',
       'inout': '%s*',
       'out': '%s*',
       'return': ' %s*',
       'store': '%s'
     },
     'blob_t': {
       'in': 'const %s',
       'inout': '%s',
@@ skipping 128 matching lines @@
     self.LogEnter('GetTypeName of %s rel=%s' % (node, release))
 
     # For Members, Params, and Typedefs get the type it refers to otherwise
     # the node in question is it's own type (struct, union etc...)
     if node.IsA('Member', 'Param', 'Typedef'):
       typeref = node.GetType(release)
     else:
       typeref = node
 
     if typeref is None:
+      node.Error('No type at release %s.' % release)
       raise CGenError('No type for %s' % node)
 
     # If the type is a (BuiltIn) Type then return it's name
     # remapping as needed
     if typeref.IsA('Type'):
       name = CGen.RemapName.get(typeref.GetName(), None)
       if name is None: name = typeref.GetName()
       name = '%s%s' % (prefix, name)
 
+    # For Interfaces, use the name + version
+    elif typeref.IsA('Interface'):
+      rel = typeref.first_release[release]
+      name = 'struct %s%s' % (prefix, self.GetStructName(typeref, rel, True))
+
     # For structures, preceed with 'struct' or 'union' as appropriate
-    elif typeref.IsA('Interface', 'Struct'):
+    elif typeref.IsA('Struct'):
       if typeref.GetProperty('union'):
         name = 'union %s%s' % (prefix, typeref.GetName())
       else:
         name = 'struct %s%s' % (prefix, typeref.GetName())
 
     # If it's an enum, or typedef then return the Enum's name
     elif typeref.IsA('Enum', 'Typedef'):
       # The enum may have skipped having a typedef, we need prefix with 'enum'.
       if typeref.GetProperty('notypedef'):
         name = 'enum %s%s' % (prefix, typeref.GetName())
@@ skipping 153 matching lines @@
                   (node, mode, func_as_ptr))
     rtype, name, arrayspec, callspec = self.GetComponents(node, release, mode)
     out = self.Compose(rtype, name, arrayspec, callspec, prefix,
                        func_as_ptr, ptr_prefix, include_name)
     self.LogExit('Exit GetSignature: %s' % out)
     return out
 
   # Define a Typedef.
   def DefineTypedef(self, node, releases, prefix='', comment=False):
     __pychecker__ = 'unusednames=comment'
-    release = releases[0]
-    out = 'typedef %s;\n' % self.GetSignature(node, release, 'return',
+    build_list = node.GetUniqueReleases(releases)
+
+    # TODO(noelallen) : Bug 157017 finish multiversion support
+    if len(build_list) != 1:
+      node.Error('Can not support multiple versions of node.')
+    assert len(build_list) == 1
+
+    out = 'typedef %s;\n' % self.GetSignature(node, build_list[0], 'return',
                                               prefix, True)
     self.Log('DefineTypedef: %s' % out)
     return out
 
   # Define an Enum.
   def DefineEnum(self, node, releases, prefix='', comment=False):
     __pychecker__ = 'unusednames=comment,releases'
     self.LogEnter('DefineEnum %s' % node)
     name = '%s%s' % (prefix, node.GetName())
     notypedef = node.GetProperty('notypedef')
     unnamed = node.GetProperty('unnamed')
+
     if unnamed:
       out = 'enum {'
     elif notypedef:
       out = 'enum %s {' % name
     else:
       out = 'typedef enum {'
     enumlist = []
     for child in node.GetListOf('EnumItem'):
       value = child.GetProperty('VALUE')
       comment_txt = GetNodeComments(child, tabs=1)
@@ skipping 45 matching lines @@
     out += '%s\n};\n' % '\n'.join(members)
     return out
 
 
   def DefineStruct(self, node, releases, prefix='', comment=False):
     __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
+
+
     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:
@@ skipping 129 matching lines @@
     ErrOut.Log('Failed generator test.')
   else:
     InfoOut.Log('Passed generator test.')
   return total_errs
 
 def Main(args):
   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
-    print DefineDepends(node)
     for node in f.GetChildren()[2:]:
-      print Define(node, comment=True, prefix='tst_')
+      print cgen.Define(node, comment=True, prefix='tst_')
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))