JSON schema compiler can't handle strings as 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 sys
@@ skipping 336 matching lines @@
     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
     elif self._IsArrayOrArrayRef(prop):
       return '%s.release()' % self._util_cc_helper.CreateValueFromArray(
           self._cpp_type_generator.GetReferencedProperty(prop), var,
           prop.optional)
-    elif prop.type_.is_fundamental:
+    elif self._IsFundamentalOrFundamentalRef(prop):
       if prop.optional:
         var = '*' + var
       return {
           PropertyType.STRING: 'Value::CreateStringValue(%s)',
           PropertyType.BOOLEAN: 'Value::CreateBooleanValue(%s)',
           PropertyType.INTEGER: 'Value::CreateIntegerValue(%s)',
           PropertyType.DOUBLE: 'Value::CreateDoubleValue(%s)',
       }[prop.type_] % var
     else:
       raise NotImplementedError('Conversion of %s to Value not '
@@ skipping 86 matching lines @@
     """
     c = Code()
     c.Sblock('{')
 
     if check_type and prop.type_ not in (
         PropertyType.CHOICES, PropertyType.ANY):
       (c.Append('if (!%(value_var)s->IsType(%(value_type)s))')
         .Append('  return %(failure_value)s;')
       )
 
-    if prop.type_.is_fundamental:
+    if self._IsFundamentalOrFundamentalRef(prop):
       if prop.optional:
         (c.Append('%(ctype)s temp;')
           .Append('if (%s)' %
-              cpp_util.GetAsFundamentalValue(prop, value_var, '&temp'))
+              cpp_util.GetAsFundamentalValue(
+                  self._cpp_type_generator.GetReferencedProperty(prop),
+                  value_var,
+                  '&temp'))
           .Append('  %(dst)s->%(name)s.reset(new %(ctype)s(temp));')
         )
       else:
         (c.Append('if (!%s)' %
             cpp_util.GetAsFundamentalValue(
-                prop, value_var, '&%s->%s' % (dst, prop.unix_name)))
+                self._cpp_type_generator.GetReferencedProperty(prop),
+                value_var,
+                '&%s->%s' % (dst, prop.unix_name)))
           .Append('return %(failure_value)s;')
         )
     elif self._IsObjectOrObjectRef(prop):
       if prop.optional:
         (c.Append('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;')
@@ skipping 165 matching lines @@
     """Determines if this property is an Object or is a ref to an Object.
     """
     return (self._cpp_type_generator.GetReferencedProperty(prop).type_ ==
         PropertyType.OBJECT)
 
   def _IsArrayOrArrayRef(self, prop):
     """Determines if this property is an Array or is a ref to an Array.
     """
     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_

[Yoyo Zhou, 2012/05/01 00:21:58]

nit: I'd put the dot on the first line

[cduvall, 2012/05/01 00:31:51]

Done.

+        .is_fundamental)