Let json schema compiler handle using arrays 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 model import PropertyType
 import any_helper
 import code
 import cpp_util
 import model
 import sys
@@ skipping 80 matching lines @@
       if type_.properties:
         raise NotImplementedError('\n'.join(model.GetModelHierarchy(type_)) +
             '\nCannot generate both functions and properties on a type')
       for function in type_.functions.values():
         (c.Concat(
             self._GenerateFunction(
                 cpp_namespace + '::' + cpp_util.Classname(function.name),
                 function))
           .Append()
         )
-    else:
+    elif type_.type_ == PropertyType.OBJECT:
       (c.Concat(self._GeneratePropertyFunctions(
           cpp_namespace, type_.properties.values()))
         .Sblock('%(namespace)s::%(classname)s()')
         .Concat(self._GenerateInitializersAndBody(type_))
         .Eblock('%(namespace)s::~%(classname)s() {}')
         .Append()
       )
       if type_.from_json:
         (c.Concat(self._GenerateTypePopulate(cpp_namespace, type_))
           .Append()
@@ skipping 202 matching lines @@
 
     E.g for std::string, generate 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<Value> and put it in
       # _GeneratePropertyFunctions, then use it here. Look at CreateEnumValue()
       # for reference.
       raise NotImplementedError(
           'Conversion of CHOICES to Value not implemented')
-    if prop.type_ in (PropertyType.REF, PropertyType.OBJECT):
+    if prop.type_  == PropertyType.OBJECT or \

[Yoyo Zhou, 2012/04/09 23:48:47]

style nits: extra space. Also, the style is to continue lines with an unclosed
parenthesis rather than with backslash.

See http://dev.chromium.org/developers/coding-style

Here's my proposal: have helper functions e.g. IsObjectOrObjectRefType and
IsArrayOrArrayRefType (these names are a little unwieldy; feel free to improve
upon them). Each of these would call GetRefType which would tell you the
referenced type of a REF, either OBJECT or ARRAY.

As a function of CCGenerator, GetRefType can then look up the types in the
namespace. This way you'd get types at 'use time', so you don't need to worry
about declaration order, and it would work with types defined in dependent
namespaces, etc.

Let me know if you think this makes sense.

[cduvall, 2012/04/10 03:06:08]

That makes it way cleaner. Good idea.

+        (prop.type_ == PropertyType.REF and not prop.is_array):
       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
-    elif prop.type_ == PropertyType.ARRAY:
+    elif prop.type_ == PropertyType.ARRAY or \
+        (prop.type_ == PropertyType.REF and prop.is_array):
       return '%s.release()' % self._util_cc_helper.CreateValueFromArray(
           prop, var)
     elif prop.type_.is_fundamental:
       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)',
@@ skipping 102 matching lines @@
           .Append('if (%s)' %
               cpp_util.GetAsFundamentalValue(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)))
           .Append('return %(failure_value)s;')
         )
-    elif prop.type_ in (PropertyType.OBJECT, PropertyType.REF):
+    elif prop.type_ == PropertyType.OBJECT or \
+        (prop.type_ == PropertyType.REF and not prop.is_array):
       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;')
           .Append('%(dst)s->%(name)s = temp.Pass();')
         )
       else:
         (c.Append('DictionaryValue* dictionary = NULL;')
           .Append('if (!%(value_var)s->GetAsDictionary(&dictionary))')
           .Append('  return %(failure_value)s;')
           .Append(
               'if (!%(ctype)s::Populate(*dictionary, &%(dst)s->%(name)s))')
           .Append('  return %(failure_value)s;')
         )
     elif prop.type_ == PropertyType.ANY:
       if prop.optional:
         c.Append('%(dst)s->%(name)s.reset(new Any());')
       c.Append(self._any_helper.Init(prop, value_var, dst) + ';')
-    elif prop.type_ == PropertyType.ARRAY:
+    elif prop.type_ == PropertyType.ARRAY or (prop.type_ == PropertyType.REF
+        and prop.is_array):
       # util_cc_helper deals with optional and required arrays
       (c.Append('ListValue* list = NULL;')
         .Append('if (!%(value_var)s->GetAsList(&list))')
         .Append('  return %(failure_value)s;')
         .Append('if (!%s)' % self._util_cc_helper.PopulateArrayFromList(
             prop, 'list', dst + '->' + prop.unix_name))
         .Append('  return %(failure_value)s;')
       )
     elif prop.type_ == PropertyType.CHOICES:
       type_var = '%(dst)s->%(name)s_type'
@@ skipping 118 matching lines @@
     if prop.type_ in (PropertyType.ENUM, PropertyType.CHOICES):
       if prop.optional:
         prop_name = prop.unix_name
         if prop.type_ == PropertyType.CHOICES:
           prop_name = prop.unix_name + '_type'
         c.Append('%s->%s = %s;' % (
           dst,
           prop_name,
           self._cpp_type_generator.GetEnumNoneValue(prop)))
     return c