Added JSON schema compiler support for serialized types

tools/json_schema_compiler/cc_generator.py

Index: tools/json_schema_compiler/cc_generator.py
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index c7465651ddf0f3bd608e13bb2ed336c7f9fe5351..89eab947335deb7b51771b5e45248d236ba3d789 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -253,20 +253,36 @@ class CCGenerator(object):
       else:
         if prop.optional:
           if prop.type_ == PropertyType.ENUM:
-            c.Sblock('if (%s != %s)' %
+            c.Sblock('if (%s != %s) {' %
                 (prop.unix_name,
                  self._cpp_type_generator.GetEnumNoneValue(prop)))
           elif prop.type_ == PropertyType.CHOICES:
-            c.Sblock('if (%s_type != %s)' %
+            c.Sblock('if (%s_type != %s) {' %
                 (prop.unix_name,
                  self._cpp_type_generator.GetEnumNoneValue(prop)))
           else:
-            c.Sblock('if (%s.get())' % prop.unix_name)
-        c.Append('value->SetWithoutPathExpansion("%s", %s);' % (
-            prop.name,
-            self._CreateValueFromProperty(prop, 'this->' + prop.unix_name)))
+            c.Sblock('if (%s.get()) {' % prop.unix_name)
+
+        if prop.type_ == prop.compiled_type:
+          c.Append('value->SetWithoutPathExpansion("%s", %s);' % (
+              prop.name,
+              self._CreateValueFromProperty(prop, 'this->' + prop.unix_name)))
+        else:
+          conversion_src = 'this->' + prop.unix_name
+          if prop.optional:
+            conversion_src = '*' + conversion_src
+          (c.Append('%s %s;' % (self._cpp_type_generator.GetType(prop),
+                                prop.unix_name))
+            .Append(cpp_util.GenerateCompiledTypeToTypeConversion(
+                self._cpp_type_generator.GetReferencedProperty(prop),
+                conversion_src,
+                prop.unix_name) + ';')
+            .Append('value->SetWithoutPathExpansion("%s", %s);' % (
+                prop.unix_name,
+                self._CreateValueFromProperty(prop, prop.unix_name)))
+          )
         if prop.optional:
-          c.Eblock();
+          c.Eblock('}');
     (c.Append()
       .Append('return value.Pass();')
       .Eblock('}')
@@ -337,7 +353,7 @@ class CCGenerator(object):
           self._cpp_type_generator.GetReferencedProperty(prop), var,
           prop.optional)
     elif self._IsFundamentalOrFundamentalRef(prop):
-      if prop.optional:
+      if prop.optional and prop.type_ == prop.compiled_type:
         var = '*' + var
       prop = self._cpp_type_generator.GetReferencedProperty(prop);
       return {
@@ -448,16 +464,42 @@ class CCGenerator(object):
                   value_var,
                   '&temp'))
           .Append('  return %(failure_value)s;')
-          .Append('%(dst)s->%(name)s.reset(new %(ctype)s(temp));')
         )
+        if prop.type_ != prop.compiled_type:
+          (c.Append('%(compiled_ctype)s temp2;')
+            .Append('if (!%s)' %

[mitchellwrosen, 2012/07/31 00:10:37]

Ugh, mis-aligned indents here. I'll fix it in a second, sorry about that.

+                 cpp_util.GenerateTypeToCompiledTypeConversion(
+                     self._cpp_type_generator.GetReferencedProperty(prop),
+                       'temp',
+                       'temp2'))
+              .Append('  return %(failure_value)s;')
+              .Append('%(dst)s->%(name)s.reset(new %(compiled_ctype)s(temp2));')
+          )
+        else:
+          c.Append('%(dst)s->%(name)s.reset(new %(ctype)s(temp));')
+
       else:
+        if prop.type_ == prop.compiled_type:
+          assignment_target = '&%s->%s' % (dst, prop.unix_name)
+        else:
+          c.Append('%(ctype)s temp;')
+          assignment_target = '&temp'
         (c.Append('if (!%s)' %
             cpp_util.GetAsFundamentalValue(
                 self._cpp_type_generator.GetReferencedProperty(prop),
                 value_var,
-                '&%s->%s' % (dst, prop.unix_name)))
+                assignment_target))
           .Append('  return %(failure_value)s;')
         )
+        if prop.type_ != prop.compiled_type:
+          (c.Append('if (!%s)' %
+              cpp_util.GenerateTypeToCompiledTypeConversion(
+                  self._cpp_type_generator.GetReferencedProperty(prop),
+                  'temp',
+                  '%s->%s' % (dst, prop.unix_name)))
+            .Append('  return %(failure_value)s;')
+          )
+
     elif self._IsObjectOrObjectRef(prop):
       if prop.optional:
         (c.Append('const base::DictionaryValue* dictionary = NULL;')
@@ -542,10 +584,11 @@ class CCGenerator(object):
         'value_var': value_var,
         'name': prop.unix_name,
         'dst': dst,
-        'failure_value': failure_value,
+        'failure_value': failure_value
     }
     if prop.type_ not in (PropertyType.CHOICES, PropertyType.ANY):
       sub['ctype'] = self._cpp_type_generator.GetType(prop)
+      sub['compiled_ctype'] = self._cpp_type_generator.GetCompiledType(prop)
       sub['value_type'] = cpp_util.GetValueType(self._cpp_type_generator
           .GetReferencedProperty(prop).type_)
     c.Substitute(sub)
@@ -721,10 +764,20 @@ class CCGenerator(object):
         # 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)))
+            param_copy, self._cpp_type_generator.GetCompiledType(param_copy)))
+        param_name = param_copy.unix_name
+        if param_copy.type_ != param_copy.compiled_type:
+          param_name = 'temp_' + param_name
+          (c.Append('%s %s;' % (self._cpp_type_generator.GetType(param_copy),
+                                param_name))
+            .Append(cpp_util.GenerateCompiledTypeToTypeConversion(
+                 param_copy,
+                 param_copy.unix_name,
+                 param_name) + ';')
+          )
+        c.Append('create_results->Append(%s);' %
+            self._CreateValueFromProperty(param_copy, param_name))
 
       c.Append('return create_results.Pass();')
       c.Eblock('}')