Convert srpc definitions from using int64 to using PP_Instance, PP_Module, an...

tools/srpcgen.py

 #!/usr/bin/python
 # Copyright 2010, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 77 matching lines @@
 
 types = {'bool': ['b', 'bool', 'u.bval', ''],
          'char[]': ['C', 'char*', 'arrays.carr', 'u.count'],
          'double': ['d', 'double', 'u.dval', ''],
          'double[]': ['D', 'double*', 'arrays.darr', 'u.count'],
          'handle': ['h', 'NaClSrpcImcDescType', 'u.hval', ''],
          'int32_t': ['i', 'int32_t', 'u.ival', ''],
          'int32_t[]': ['I', 'int32_t*', 'arrays.iarr', 'u.count'],
          'int64_t': ['l', 'int64_t', 'u.lval', ''],
          'int64_t[]': ['L', 'int64_t', 'arrays.larr', 'u.count'],
+         'PP_Instance': ['l', 'PP_Instance', 'u.lval', ''],
+         'PP_Module': ['l', 'PP_Module', 'u.lval', ''],
+         'PP_Resource': ['l', 'PP_Resource', 'u.lval', ''],
          'string': ['s', 'char*', 'arrays.str', ''],
         }
 
 
+def AddHeader(name):
+  """Adds a header to both the .cc and .h files."""
+  global HEADER_START
+  global SOURCE_FILE_INCLUDES
+
+  HEADER_START += "#include \"%s\"\n" % name
+  SOURCE_FILE_INCLUDES += "#include \"%s\"\n" % name
+
+
 def CountName(name):
   """Returns the name of the auxiliary count member used for array typed."""
   return '%s_bytes' % name
 
 
 def FormatRpcPrototype(is_server, class_name, indent, rpc):
   """Returns a string for the prototype of an individual RPC."""
 
   def FormatArgs(is_output, args):
     """Returns a string containing the formatted arguments for an RPC."""
@@ skipping 205 matching lines @@
 def MakePath(name):
   paths = name.split(os.sep)
   path = os.sep.join(paths[:-1])
   try:
     os.makedirs(path)
   except OSError:
     return
 
 
 def main(argv):
-  usage = 'Usage: srpcgen.py <-c | -s> [--include=<name>] <iname> <gname>'
-  usage = usage + ' <.h> <.cc> <specs>'
+  usage = 'Usage: srpcgen.py <-c | -s> [--include=<name>] [--ppapi]'
+  usage = usage + ' <iname> <gname> <.h> <.cc> <specs>'
 
   mode = None
+  ppapi = False
   try:
-    long_opts = ['include=']
+    long_opts = ['include=', 'ppapi']
     opts, pargs = getopt.getopt(argv[1:], 'cs', long_opts)
   except getopt.error, e:
     print >>sys.stderr, 'Illegal option:', str(e)
     print >>sys.stderr, usage
     return 1
 
   # Get the class name for the interface.
   interface_name = pargs[0]
   # Get the name for the token used as a multiple inclusion guard in the header.
   include_guard_name = pargs[1]
   # Get the name of the header file to be generated.
   h_file_name = pargs[2]
   MakePath(h_file_name)
   h_file = open(h_file_name, 'w')
   # Get the name of the source file to be generated.  Depending upon whether
   # -c or -s is generated, this file contains either client or server methods.
   cc_file_name = pargs[3]
   MakePath(cc_file_name)
   cc_file = open(cc_file_name, 'w')
   # The remaining arguments are the spec files to be compiled.
   spec_files = pargs[4:]
 
   for opt, val in opts:
     if opt == '-c':
       mode = 'client'
     elif opt == '-s':
       mode = 'server'
     elif opt == '--include':
       h_file_name = val
+    elif opt == '--ppapi':
+      ppapi = True
+
+  if ppapi:
+    AddHeader("ppapi/c/pp_instance.h")
+    AddHeader("ppapi/c/pp_module.h")
+    AddHeader("ppapi/c/pp_resource.h")
 
   # Convert to forward slash paths if needed
   h_file_name = "/".join(h_file_name.split("\\"))
 
   # Verify we picked server or client mode
   if not mode:
     print >>sys.stderr, 'Neither -c nor -s specified'
     usage()
     return 1
 
   # Combine the rpc specs from spec_files into rpcs.
   specs = []
   for spec_file in spec_files:
     code_obj = compile(open(spec_file, 'r').read(), 'file', 'eval')
     specs.append(eval(code_obj))
   # Print out the requested files.
   if mode == 'client':
     PrintHeaderFile(h_file, False, include_guard_name, interface_name, specs)
     PrintClientFile(cc_file, h_file_name, specs)
   elif mode == 'server':
     PrintHeaderFile(h_file, True, include_guard_name, interface_name, specs)
     PrintServerFile(cc_file, h_file_name, interface_name, specs)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))