Chromium Code Reviews| Index: tools/json_schema_compiler/cpp_type_generator.py |
| diff --git a/tools/json_schema_compiler/cpp_type_generator.py b/tools/json_schema_compiler/cpp_type_generator.py |
| index 0a1768be035b302e0b2368253bd41481b64efc79..5afc91504e6ec22aaccb6ea41929a082e547da87 100644 |
| --- a/tools/json_schema_compiler/cpp_type_generator.py |
| +++ b/tools/json_schema_compiler/cpp_type_generator.py |
| @@ -175,12 +175,19 @@ class CppTypeGenerator(object): |
| for namespace, types in sorted(self._NamespaceTypeDependencies().items()): |
| c.Append('namespace %s {' % namespace.name) |
| for type_ in types: |
| - if namespace.types[type_].type_ != PropertyType.ARRAY: |
| + if namespace.types[type_].type_ == PropertyType.STRING: |
| + c.Append('typedef std::string %s;' % type_) |
|
Yoyo Zhou
2012/05/01 00:21:58
I am not sure about whether this is advisable styl
cduvall
2012/05/01 00:31:51
Yeah, this was the best solution I could come up w
|
| + elif namespace.types[type_].type_ == PropertyType.ARRAY: |
| + c.Append('typedef std::vector<%(item_type)s> %(name)s;') |
| + c.Substitute({'name': type_, 'item_type': |
| + self.GetType(namespace.types[type_].item_type, |
| + wrap_optional=True)}) |
| + else: |
| c.Append('struct %s;' % type_) |
| c.Append('}') |
| c.Concat(self.GetNamespaceStart()) |
| for (name, type_) in self._namespace.types.items(): |
| - if not type_.functions and type_.type_ != PropertyType.ARRAY: |
| + if not type_.functions and type_.type_ == PropertyType.OBJECT: |
| c.Append('struct %s;' % name) |
| c.Concat(self.GetNamespaceEnd()) |
| return c |