JSON Schema Compiler now supports conversion from Choice to base::Value.

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 237 matching lines @@
     )
     for prop in type_.properties.values():
       if prop.type_ == PropertyType.ADDITIONAL_PROPERTIES:
         c.Append('value->MergeDictionary(&%s);' % prop.unix_name)
       else:
         if prop.optional:
           if prop.type_ == PropertyType.ENUM:
             c.Sblock('if (%s != %s)' %
                 (prop.unix_name,
                     self._cpp_type_generator.GetEnumNoneValue(prop)))
-          else:
+          elif not prop.type_ == PropertyType.CHOICES:

[not at google - send to devlin, 2012/07/18 01:21:35]

Prefer to structure this like

if prop.type_ == PropertyType.ENUM:
  ..
elif prop.type_ == PropertyType.CHOICES:
  # Ignore choices because...?
  pass
else:
  ...

Easier to casually read.

[chebert, 2012/07/19 00:56:01]

Done.

             c.Sblock('if (%s.get())' % prop.unix_name)
         c.Append('value->SetWithoutPathExpansion("%s", %s);' % (
             prop.name,
             self._CreateValueFromProperty(prop, 'this->' + prop.unix_name)))
         if prop.optional:
           c.Eblock();
     (c.Append()
       .Append('return value.Pass();')
       .Eblock('}')
     )
     return c
 
   def _GenerateFunction(self, cpp_namespace, function):
     """Generates the definitions for function structs.
     """
     c = Code()
 
     # Params::Populate function
     if function.params:
       c.Concat(self._GeneratePropertyFunctions(cpp_namespace + '::Params',
-          function.params))
+          function.params, from_function=True))

[not at google - send to devlin, 2012/07/18 01:21:35]

Like I said in the header, use from_client.

[chebert, 2012/07/19 00:56:01]

Done.

       (c.Append('%(cpp_namespace)s::Params::Params() {}')
         .Append('%(cpp_namespace)s::Params::~Params() {}')
         .Append()
         .Concat(self._GenerateFunctionParamsCreate(cpp_namespace, function))
         .Append()
       )
 
     # Results::Create function
     if function.callback:
       c.Concat(self._GenerateCreateCallbackArguments(
           "%s::Results" % cpp_namespace, function.callback))
 
     c.Substitute({'cpp_namespace': cpp_namespace})
 
     return c
 
+  def _GenerateGetChoiceValue(self, cpp_namespace, prop):

[not at google - send to devlin, 2012/07/18 01:21:35]

nit: define below the place that it's used.

[chebert, 2012/07/19 00:56:01]

Done.

+    """Generates GetChoiceValue() that returns a |scoped_ptr<base::Value>|

[not at google - send to devlin, 2012/07/18 01:21:35]

usually |foo| is used for variables/parameters, not types.

[chebert, 2012/07/19 00:56:01]

Done.

+    representing the choice value.
+    """
+    c = Code()
+    (c.Sblock('scoped_ptr<base::Value> '
+              '%(cpp_namespace)s::GetChoiceValue(%(arg)s) const {')
+      .Sblock('switch(%s) {' % prop.unix_name)
+    )
+    if prop.optional:
+      (c.Sblock('case %s: {' %
+             (self._cpp_type_generator.GetEnumNoneValue(prop)))
+          .Append('return scoped_ptr<base::Value>();')
+        .Eblock('}')

[not at google - send to devlin, 2012/07/18 01:21:35]

The {} in each of these case statements is unnecessary; they're all just "return
blah".

[chebert, 2012/07/19 00:56:01]

Done.

+      )
+    for choice in self._cpp_type_generator.ExpandParams([prop]):
+      (c.Sblock('case %s: {' %
+            self._cpp_type_generator.GetEnumValue(prop, choice.type_.name))
+        .Append('return scoped_ptr<base::Value>(%s);' %

[not at google - send to devlin, 2012/07/18 01:21:35]

can do "make_scoped_ptr(%s)" here

[chebert, 2012/07/19 00:56:01]

Done.

+            self._CreateValueFromProperty(choice, choice.unix_name))
+        .Eblock('}')
+      )
+    (c.Eblock('}')
+      .Append('return scoped_ptr<base::Value>();')
+      .Eblock('}')

[not at google - send to devlin, 2012/07/18 01:21:35]

also add a blank line

[chebert, 2012/07/19 00:56:01]

Done.

+      .Substitute({
+        'cpp_namespace': cpp_namespace,
+        'arg': cpp_util.GetParameterDeclaration(
+            prop, self._cpp_type_generator.GetChoicesEnumType(prop))
+      })
+    )
+    return c
+
   def _GenerateCreateEnumValue(self, cpp_namespace, prop):
     """Generates CreateEnumValue() that returns the |base::StringValue|
     representation of an enum.
     """
     c = Code()
     c.Append('// static')
     c.Sblock('scoped_ptr<base::Value> %(cpp_namespace)s::CreateEnumValue('
              '%(arg)s) {')
     c.Sblock('switch (%s) {' % prop.unix_name)
     if prop.optional:
@@ skipping 24 matching lines @@
 
   def _CreateValueFromProperty(self, prop, var):
     """Creates a base::Value given a property. Generated code passes ownership
     to caller.
 
     var: variable or variable*
 
     E.g for std::string, generate base::Value::CreateStringValue(var)
     """
     if prop.type_ == PropertyType.CHOICES:
-      # CHOICES conversion not implemented. If needed, write something to
-      # generate a function that returns a scoped_ptr<base::Value> and put it in
-      # _GeneratePropertyFunctions, then use it here. Look at CreateEnumValue()
-      # for reference.
-      raise NotImplementedError(
-          'Conversion of CHOICES to base::Value not implemented')
-    if self._IsObjectOrObjectRef(prop):
+      return 'GetChoiceValue(%s_type).release()' % var
+    elif self._IsObjectOrObjectRef(prop):
       if prop.optional:
         return '%s->ToValue().release()' % var
       else:
         return '%s.ToValue().release()' % var
     elif prop.type_ == PropertyType.ANY:
       return '%s.DeepCopy()' % self._any_helper.GetValue(prop, var)
     elif prop.type_ == PropertyType.ADDITIONAL_PROPERTIES:
       return '%s.DeepCopy()' % var
     elif prop.type_ == PropertyType.ENUM:
       return 'CreateEnumValue(%s).release()' % var
@@ skipping 248 matching lines @@
       (c.Append(
           ('if' if i == 0 else 'else if') +
           '(enum_as_string == "%s")' % enum_value)
         .Append('  ' + enum_temp + ' = %s;' % (
           self._cpp_type_generator.GetEnumValue(prop, enum_value)))
       )
     (c.Append('else')
       .Append('  return %(failure_value)s;')
     )
 
-  def _GeneratePropertyFunctions(self, param_namespace, params):
+  def _GeneratePropertyFunctions(self, param_namespace, params,
+                                 from_function=False):
     """Generate the functions for structures generated by a property such as
     CreateEnumValue for ENUMs and Populate/ToValue for Params/Results objects.
+    If from_function is True if these properties belong to an API Function.
     """
     c = Code()
     for param in params:
       if param.type_ == PropertyType.OBJECT:
         c.Concat(self._GenerateType(
             param_namespace + '::' + cpp_util.Classname(param.name),
             param))
         c.Append()
       elif param.type_ == PropertyType.ARRAY:
         c.Concat(self._GeneratePropertyFunctions(
             param_namespace, [param.item_type]))
       elif param.type_ == PropertyType.CHOICES:
         c.Concat(self._GeneratePropertyFunctions(
             param_namespace, param.choices.values()))
+        if not from_function:
+          c.Concat(self._GenerateGetChoiceValue(param_namespace, param))
       elif param.type_ == PropertyType.ENUM:
         c.Concat(self._GenerateCreateEnumValue(param_namespace, param))
         c.Append()
     return c
 
   def _GenerateCreateCallbackArguments(self, function_scope, callback):
     """Generate all functions to create Value parameters for a callback.
 
     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
     expanded_params = self._cpp_type_generator.ExpandParams(params)
-    c.Concat(self._GeneratePropertyFunctions(function_scope, expanded_params))
+    c.Concat(self._GeneratePropertyFunctions(function_scope, expanded_params,
+                                             from_function=True))
 
     param_lists = self._cpp_type_generator.GetAllPossibleParameterLists(params)
     for param_list in param_lists:
       (c.Sblock('scoped_ptr<base::ListValue> %(function_scope)s::'
                 'Create(%(declaration_list)s) {')
         .Append('scoped_ptr<base::ListValue> create_results('
                 'new base::ListValue());')
       )
       declaration_list = []
       for param in param_list:
@@ skipping 45 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)