Supporting more APIs with json_schema_compiler

tools/json_schema_compiler/h_generator.py

 # 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.
 
 from model import PropertyType
 import code
 import cpp_util
 import os
 
 class HGenerator(object):
@@ skipping 79 matching lines @@
           self._cpp_type_generator.GetType(prop, wrap_optional=True),
           prop.unix_name))
       c.Append()
     # Generate the enums needed for any fields with "choices"
     for prop in props:
       if prop.type_ == PropertyType.CHOICES:
         c.Sblock('enum %(enum_type)s {')
         c.Append(self._cpp_type_generator.GetChoiceEnumNoneValue(prop) + ',')
         for choice in prop.choices.values():
           c.Append(
-              self._cpp_type_generator.GetChoiceEnumValue( prop, choice.type_)
+              self._cpp_type_generator.GetChoiceEnumValue(prop, choice.type_)
               + ',')
         (c.Eblock('};')
           .Append()
           .Append('%(enum_type)s %(name)s_type;')
         )
         c.Substitute({
             'enum_type': self._cpp_type_generator.GetChoicesEnumType(prop),
             'name': prop.unix_name
         })
     return c
@@ skipping 78 matching lines @@
     if not params:
       c.Append('Value* Create();')
     else:
       # If there is a single parameter, this is straightforward. However, if
       # the callback parameter is of 'choices', this generates a Create method
       # for each choice. This works because only 1 choice can be returned at a
       # time.
       for param in self._cpp_type_generator.GetExpandedChoicesInParams(params):
         if param.description:
           c.Comment(param.description)
-        c.Append('Value* Create(%s);' %
-            cpp_util.GetConstParameterDeclaration(
-              param, self._cpp_type_generator))
+        if param.type_ == PropertyType.OBJECT:
+          raise NotImplementedError('OBJECT return type not supported')
+        c.Append('Value* Create(%s);' % cpp_util.GetParameterDeclaration(
+            param, self._cpp_type_generator.GetType(param)))
     c.Eblock('};')
 
     return c
 
   def _GenerateIfndefName(self):
     """Formats a path and filename as a #define name.
 
     e.g chrome/extensions/gen, file.h becomes CHROME_EXTENSIONS_GEN_FILE_H__.
     """
     return (('%s_%s_H__' %
         (self._namespace.source_file_dir, self._target_namespace))
         .upper().replace(os.sep, '_'))