Add the ability to code generated prepopulated static nested structs

tools/json_to_struct/json_to_struct.py

 #!/usr/bin/env python
 # Copyright 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.
 
 # Format for the JSON schema file:
 # {
 #   "type_name": "DesiredCStructName",
 #   "headers": [          // Optional list of headers to be included by the .h.
 #     "path/to/header.h"
 #   ],
 #   "schema": [           // Fields of the generated structure.
 #     {
 #       "field": "my_enum_field",
-#       "type": "enum",   // Either: int, string, string16, enum, array.
+#       "type": "enum",   // Either: int, string, string16, enum, array, struct.
 #       "default": "RED", // Optional. Cannot be used for array.
 #       "ctype": "Color"  // Only for enum, specify the C type.
 #     },
 #     {
 #       "field": "my_int_array_field",  // my_int_array_field_size will also
 #       "type": "array",                // be generated.
 #       "contents": {
 #         "type": "int"   // Either: int, string, string16, enum, array.
 #       }
 #     },
+#     {
+#       "field": "my_struct_field",
+#       "type_name": "PointStuct",
+#       "type": "struct",
+#       "fields": [
+#         {"field": "x", "type": "int"},
+#         {"field": "y", "type": "int"}
+#       ]
+#     },
 #     ...
 #   ]
 # }
 #
 # Format for the JSON description file:
 # {
 #   "int_variables": {    // An optional list of constant int variables.
 #     "kDesiredConstantName": 45
 #   },
 #   "elements": {         // All the elements for which to create static
 #                         // initialization code in the .cc file.
 #     "my_const_variable": {
 #       "my_int_field": 10,
 #       "my_string_field": "foo bar",
 #       "my_enum_field": "BLACK",
 #       "my_int_array_field": [ 1, 2, 3, 5, 7 ],
+#       "my_struct_field": {"x": 1, "y": 2}
 #     },
 #     "my_other_const_variable": {
 #       ...
 #     }
 #   }
 # }
 
 import json
 from datetime import datetime
 import os.path
@@ skipping 60 matching lines @@
     f.write('\n')
 
     if namespace:
       f.write('namespace %s {\n' % namespace)
       f.write('\n')
 
     f.write(struct_generator.GenerateStruct(
       schema['type_name'], schema['schema']))
     f.write('\n')
 
-    for var_name, value in description.get('int_variables', []).items():
+    for var_name, value in description.get('int_variables', {}).items():
       f.write('extern const int %s;\n' % var_name)
     f.write('\n')
 
     for element_name, element in description['elements'].items():
       f.write('extern const %s %s;\n' % (schema['type_name'], element_name))
 
     if namespace:
       f.write('\n')
       f.write('}  // namespace %s\n' % namespace)
 
@@ skipping 69 matching lines @@
     basepath = os.path.normpath(opts.destbase)
   else:
     basepath = ''
 
   schema = _Load(opts.schema)
   description = _Load(description_filename)
 
   head = HEAD % (datetime.now().year, opts.schema, description_filename)
   _GenerateH(basepath, output_root, head, opts.namespace, schema, description)
   _GenerateCC(basepath, output_root, head, opts.namespace, schema, description)