Added ToJson to JSON schema compiler.

tools/json_schema_compiler/cc_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 code import Code
 from model import PropertyType
 import any_helper
 import cpp_util
 import model
 import schema_util
@@ skipping 662 matching lines @@
   def _GenerateReturnCase(self, case_value, return_value):
     """Generates a single return case for a switch block.
     """
     c = Code()
     (c.Append('case %s:' % case_value)
       .Append('  return %s;' % return_value)
     )
     return c
 
   def _GenerateCreateCallbackArguments(self, function_scope, callback):
-    """Generate all functions to create Value parameters for a callback.
+    """Generate all functions to create Value parameters for a callback, and
+    JSON from the Value.

[not at google - send to devlin, 2012/07/24 23:04:29]

We should only generate these for events, not functions. Perhaps add an optional
parameter to this method.

[mitchellwrosen, 2012/07/25 17:08:20]

Done.

 
     E.g for function "Bar", generate Bar::Results::Create
     E.g for event "Baz", generate Baz::Create
 
     function_scope: the function scope path, e.g. Foo::Bar for the function
     Foo::Bar::Baz().
     callback: the Function object we are creating callback arguments for.
     """
     c = Code()
     params = callback.params
@@ skipping 13 matching lines @@
         # scoped_ptr if it's optional.
         param_copy = param.Copy()
         param_copy.optional = False
         c.Append('create_results->Append(%s);' %
             self._CreateValueFromProperty(param_copy, param_copy.unix_name))
         declaration_list.append("const %s" % cpp_util.GetParameterDeclaration(
             param_copy, self._cpp_type_generator.GetType(param_copy)))
 
       c.Append('return create_results.Pass();')
       c.Eblock('}')
+      c.Append()
+      (c.Sblock('scoped_ptr<std::string> %(function_scope)s::'

[not at google - send to devlin, 2012/07/24 23:04:29]

as I mentioned in the bug, only need to return a std::string not a
scoped_ptr<std::string>. The compiler should optimise out any unnecessary copy.

[mitchellwrosen, 2012/07/25 17:08:20]

Done.

+                'ToJson(%(declaration_list)s) {')
+        .Append('scoped_ptr<base::ListValue> create_results = '
+                'Create(%(param_list)s);')
+        .Append('scoped_ptr<std::string> json(new std::string());')
+        .Append('base::JSONWriter::Write(create_results.get(), json.get());')
+        .Append('return json.Pass();')
+      )
+      c.Eblock('}')
+
       c.Substitute({
           'function_scope': function_scope,
-          'declaration_list': ', '.join(declaration_list)
+          'declaration_list': ', '.join(declaration_list),
+          'param_list': ', '.join([param.unix_name for param in param_list])
       })
 
     return c
 
   def _InitializePropertyToDefault(self, prop, dst):
     """Initialize a model.Property to its default value inside an object.
 
     E.g for optional enum "state", generate dst->state = STATE_NONE;
 
     dst: Type*
@@ skipping 21 matching lines @@
     """
     return (self._cpp_type_generator.GetReferencedProperty(prop).type_ ==
         PropertyType.ARRAY)
 
   def _IsFundamentalOrFundamentalRef(self, prop):
     """Determines if this property is a Fundamental type or is a ref to a
     Fundamental type.
     """
     return (self._cpp_type_generator.GetReferencedProperty(prop).type_.
         is_fundamental)