PPAPI: Format ppapi/thunk using clang-format.

ppapi/generators/idl_thunk.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 thunks """
 
 import glob
 import os
 import re
@@ skipping 418 matching lines @@
       return False
 
     thunk_out = IDLOutFile(savename)
     body, meta = self.GenerateBody(thunk_out, filenode, releases, options)
     # TODO(teravest): How do we handle repeated values?
     if filenode.GetProperty('thunk_include'):
       meta.AddInclude(filenode.GetProperty('thunk_include'))
     self.WriteHead(thunk_out, filenode, releases, options, meta)
     thunk_out.Write('\n\n'.join(body))
     self.WriteTail(thunk_out, filenode, releases, options)
+    thunk_out.ClangFormat()
     return thunk_out.Close()
 
   def WriteHead(self, out, filenode, releases, options, meta):
     __pychecker__ = 'unusednames=options'
     cgen = CGen()
 
     cright_node = filenode.GetChildren()[0]
     assert(cright_node.IsA('Copyright'))
     out.Write('%s\n' % cgen.Copyright(cright_node, cpp_style=True))
 
-    # Wrap the From ... modified ... comment if it would be >80 characters.
     from_text = 'From %s' % (
         filenode.GetProperty('NAME').replace(os.sep,'/'))
     modified_text = 'modified %s.' % (
         filenode.GetProperty('DATETIME'))
-    if len(from_text) + len(modified_text) < 74:
-      out.Write('// %s %s\n\n' % (from_text, modified_text))
-    else:
-      out.Write('// %s,\n//   %s\n\n' % (from_text, modified_text))
+    out.Write('// %s %s\n\n' % (from_text, modified_text))
 
     if meta.BuiltinIncludes():
       for include in sorted(meta.BuiltinIncludes()):
         out.Write('#include <%s>\n' % include)
       out.Write('\n')
 
     # TODO(teravest): Don't emit includes we don't need.
     includes = ['ppapi/c/pp_errors.h',
                 'ppapi/shared_impl/tracked_callback.h',
                 'ppapi/thunk/enter.h',
@@ skipping 54 matching lines @@
     out.Write('\n\n')
     for node in filenode.GetListOf('Interface'):
       build_list = node.GetUniqueReleases(releases)
       for build in build_list:
         version = node.GetVersion(build).replace('.', '_')
         thunk_name = 'g_' + node.GetName().lower() + '_thunk_' + \
                       version
         thunk_type = '_'.join((node.GetName(), version))
         version_list.append((thunk_type, thunk_name))
 
-        declare_line = 'const %s %s = {' % (thunk_type, thunk_name)
-        if len(declare_line) > 80:
-          declare_line = 'const %s\n    %s = {' % (thunk_type, thunk_name)
-        out.Write('%s\n' % declare_line)
+        out.Write('const %s %s = {  //\n' % (thunk_type, thunk_name))
         generated_functions = []
         members = node.GetListOf('Member')
         for child in members:
           rtype, name, arrays, args = cgen.GetComponents(
               child, build, 'return')
           if child.InReleases([build]):
             if not _IsNewestMember(child, members, releases):
               version = child.GetVersion(
                   child.first_release[build]).replace('.', '_')
               name += '_' + version
             generated_functions.append(name)
-        out.Write(',\n'.join(['  &%s' % f for f in generated_functions]))
-        out.Write('\n};\n\n')
+        out.Write(',  //\n'.join(['  &%s' % f for f in generated_functions]))

[teravest, 2014/04/17 14:00:50]

It'd be nice to have a comment here saying what these empty comments are for.

+        out.Write('  //\n};\n\n')
 
     out.Write('}  // namespace\n')
     out.Write('\n')
     for thunk_type, thunk_name in version_list:
-      thunk_decl = ('PPAPI_THUNK_EXPORT const %s* Get%s_Thunk() {\n' %
+      out.Write('PPAPI_THUNK_EXPORT const %s* Get%s_Thunk() {\n' %
                     (thunk_type, thunk_type))
-      if len(thunk_decl) > 80:
-        thunk_decl = ('PPAPI_THUNK_EXPORT const %s*\n    Get%s_Thunk() {\n' %
-                      (thunk_type, thunk_type))
-      out.Write(thunk_decl)
       out.Write('  return &%s;\n' % thunk_name)
       out.Write('}\n')
       out.Write('\n')
     out.Write('}  // namespace thunk\n')
     out.Write('}  // namespace ppapi\n')
 
 
 tgen = TGen()
 
 
@@ skipping 13 matching lines @@
     print "Golden file for M13-M15 failed."
     failed = 1
   else:
     print "Golden file for M13-M15 passed."
 
   return failed
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))