Added JSON schema compiler support for serialized types

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 416 matching lines @@
     failure_value: the value to return if |prop| cannot be extracted from
     |value_var|
     check_type: if true, will check if |value_var| is the correct
     base::Value::Type
     """
     c = Code()
     c.Sblock('{')
 
     if self._IsFundamentalOrFundamentalRef(prop):
       if prop.optional:
-        (c.Append('%(ctype)s temp;')
-          .Append('if (!%s)' %
-              cpp_util.GetAsFundamentalValue(
-                  self._cpp_type_generator.GetReferencedProperty(prop),
-                  value_var,
-                  '&temp'))
-          .Append('  return %(failure_value)s;')
-          .Append('%(dst)s->%(name)s.reset(new %(ctype)s(temp));')
-        )
+        if prop.serialized_type is None:
+          (c.Append('%(ctype)s temp;')
+            .Append('if (!%s)' %
+                cpp_util.GetAsFundamentalValue(
+                    self._cpp_type_generator.GetReferencedProperty(prop),
+                    value_var,
+                    '&temp'))
+            .Append('  return %(failure_value)s;')
+            .Append('%(dst)s->%(name)s.reset(new %(ctype)s(temp));')
+          )
+        else:
+          (c.Append('%(ctype)s temp1;')
+            .Append('%(serialized_ctype)s temp2;')
+            .Append('if (!%s || !%s)' %
+                (cpp_util.GetAsFundamentalValue(
+                     self._cpp_type_generator.GetReferencedProperty(prop),
+                     value_var,
+                     '&temp1'),
+                 cpp_util.DoConversion(
+                     self._cpp_type_generator.GetReferencedProperty(prop),
+                     'temp1',
+                     '&temp2')))
+            .Append('  return %(failure_value)s;')
+            .Append('%(dst)s->%(name)s.reset(new %(serialized_ctype)s(temp2));')
+          )
+
       else:
-        (c.Append('if (!%s)' %
-            cpp_util.GetAsFundamentalValue(
-                self._cpp_type_generator.GetReferencedProperty(prop),
-                value_var,
-                '&%s->%s' % (dst, prop.unix_name)))
-          .Append('  return %(failure_value)s;')
-        )
+        if prop.serialized_type is None:
+          (c.Append('if (!%s)' %
+                cpp_util.GetAsFundamentalValue(
+                    self._cpp_type_generator.GetReferencedProperty(prop),
+                    value_var,
+                    '&%s->%s' % (dst, prop.unix_name)))
+            .Append('  return %(failure_value)s;')
+          )
+        else:
+          (c.Append('%(ctype)s temp;')
+            .Append('if (!%s || !%s)' %
+                (cpp_util.GetAsFundamentalValue(
+                     self._cpp_type_generator.GetReferencedProperty(prop),
+                     value_var,
+                     '&temp'),
+                 cpp_util.DoConversion(
+                     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('base::DictionaryValue* dictionary = NULL;')
           .Append('if (!%(value_var)s->GetAsDictionary(&dictionary))')
           .Append('  return %(failure_value)s;')
           .Append('scoped_ptr<%(ctype)s> temp(new %(ctype)s());')
           .Append('if (!%(ctype)s::Populate(*dictionary, temp.get()))')
           .Append('  return %(failure_value)s;')
           .Append('%(dst)s->%(name)s = temp.Pass();')
         )
@@ skipping 65 matching lines @@
       raise NotImplementedError(prop.type_)
     c.Eblock('}')
     sub = {
         'value_var': value_var,
         'name': prop.unix_name,
         'dst': dst,
         'failure_value': failure_value,
     }
     if prop.type_ not in (PropertyType.CHOICES, PropertyType.ANY):
       sub['ctype'] = self._cpp_type_generator.GetType(prop)
+      sub['serialized_ctype'] = self._cpp_type_generator.GetType(
+          prop, serialized=True)
       sub['value_type'] = cpp_util.GetValueType(self._cpp_type_generator
           .GetReferencedProperty(prop).type_)
     c.Substitute(sub)
     return c
 
   def _GenerateListValueToEnumArrayConversion(self, c, prop):
       """Appends code that converts a ListValue of string contstants to
       an array of enums in dst.
       Leaves dst, name, and failure_value unsubstituted.
 
@@ skipping 202 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)