Add support for generating thunk source from IDL.

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 408 matching lines @@
   #
   # GetSignature
   #
   # Returns the 'C' style signature of the object
   #  prefix - A prefix for the object's name
   #  func_as_ptr - Formats a function as a function pointer
   #  ptr_prefix - A prefix that goes before the "*" for a function pointer
   #  include_name - If true, include member name in the signature.
   #                 If false, leave it out. In any case, prefix and ptr_prefix
   #                 are always included.
+  #  include_version - if True, include version in the member name
   #
   def GetSignature(self, node, release, mode, prefix='', func_as_ptr=True,
-                   ptr_prefix='', include_name=True):
+                   ptr_prefix='', include_name=True, include_version=False):
     self.LogEnter('GetSignature %s %s as func=%s' %
                   (node, mode, func_as_ptr))
     rtype, name, arrayspec, callspec = self.GetComponents(node, release, mode)
+    if include_version:
+      name = self.GetStructName(node, release, True)
     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'
     build_list = node.GetUniqueReleases(releases)
 
@@ skipping 115 matching lines @@
   #
   # Copyright and Comment
   #
   # Generate a comment or copyright block
   #
   def Copyright(self, node, tabs=0):
     lines = node.GetName().split('\n')
     return CommentLines(lines, tabs)
 
 
+  def Indent(self, data, tabs=0):
+    """Handles indentation and 80-column line wrapping."""
+    tab = '  ' * tabs
+    lines = []
+    for line in data.split('\n'):
+      # Add indentation
+      line = tab + line
+      if len(line) > 80:
+        left = line.rfind('(') + 1
+        args = line[left:].split(',')
+        orig_args = args
+        orig_left = left
+        # Look for a better split.
+        while args[0][0] == ')':

[dmichael (off chromium), 2012/11/16 18:24:44]

Can you maybe put an example of the kind of code you're splitting? Before &
after? I think that would help with understanding the code. As-is, the ')' check
is slightly non-obvious (my best guess is that if you see "()", you're looking
left for another "(" to break on.)

[teravest, 2012/11/16 18:52:36]

Sure. Comment added.

+          left = line.rfind('(', 0, left - 1) + 1
+          if left == 0:  # No more parens, take the original option
+            args = orig_args
+            left = orig_left
+            break
+          args = line[left:].split(',')
+
+        line_max = 0
+        for arg in args:
+          if len(arg) > line_max: line_max = len(arg)
+
+        if left + line_max >= 80:
+          space = '%s    ' % tab

[dmichael (off chromium), 2012/11/16 18:24:44]

indent might be a better name than space?

[teravest, 2012/11/16 18:52:36]

Done. I had left this unchanged from the previous code.

+          args =  (',\n%s' % space).join([arg.strip() for arg in args])
+          lines.append('%s\n%s%s' % (line[:left], space, args))
+        else:
+          space = ' ' * (left - 1)
+          args =  (',\n%s' % space).join(args)
+          lines.append('%s%s' % (line[:left], args))
+      else:
+        lines.append(line.rstrip())

[dmichael (off chromium), 2012/11/16 18:24:44]

I think I'd flip the if and the else, since in the current order, by the time
you get here, you forget what the original condition was.

[teravest, 2012/11/16 18:52:36]

Done.

+    return '\n'.join(lines)
+
+
   # Define a top level object.
   def Define(self, node, releases, tabs=0, prefix='', comment=False):
     # If this request does not match unique release, or if the release is not
     # available (possibly deprecated) then skip.
     unique = node.GetUniqueReleases(releases)
     if not unique or not node.InReleases(releases):
       return ''
 
     self.LogEnter('Define %s tab=%d prefix="%s"' % (node,tabs,prefix))
     declmap = dict({
       'Enum': CGen.DefineEnum,
       'Function': CGen.DefineMember,
       'Interface': CGen.DefineStruct,
       'Member': CGen.DefineMember,
       'Struct': CGen.DefineStruct,
       'Typedef': CGen.DefineTypedef
     })
 
     out = ''
     func = declmap.get(node.cls, None)
     if not func:
       ErrOut.Log('Failed to define %s named %s' % (node.cls, node.GetName()))
     define_txt = func(self, node, releases, prefix=prefix, comment=comment)
 
     comment_txt = GetNodeComments(node, tabs=0)
     if comment_txt and comment:
       out += comment_txt
     out += define_txt
 
-    tab = '  ' * tabs
-    lines = []
-    for line in out.split('\n'):
-      # Add indentation
-      line = tab + line
-      if len(line) > 80:
-        left = line.rfind('(') + 1
-        args = line[left:].split(',')
-        line_max = 0
-        for arg in args:
-          if len(arg) > line_max: line_max = len(arg)
+    indented_out = self.Indent(out, tabs)
+    self.LogExit('Exit Define')
+    return indented_out
 
-        if left + line_max >= 80:
-          space = '%s    ' % tab
-          args =  (',\n%s' % space).join([arg.strip() for arg in args])
-          lines.append('%s\n%s%s' % (line[:left], space, args))
-        else:
-          space = ' ' * (left - 1)
-          args =  (',\n%s' % space).join(args)
-          lines.append('%s%s' % (line[:left], args))
-      else:
-        lines.append(line.rstrip())
-    self.LogExit('Exit Define')
-    return '\n'.join(lines)
 
 # Clean a string representing an object definition and return then string
 # as a single space delimited set of tokens.
 def CleanString(instr):
   instr = instr.strip()
   instr = instr.split()
   return ' '.join(instr)
 
 
 # Test a file, by comparing all it's objects, with their comments.
@@ skipping 52 matching lines @@
   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_')
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))
-

[noelallen1, 2012/11/15 22:03:18]

Make sure to leave blank line to prevent windows patch issue.

[teravest, 2012/11/16 17:33:36]

Done.