Move chrome.downloads out of experimental to dev

tools/json_schema_compiler/h_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 cpp_util
-import model
-import os
 import schema_util
 
 class HGenerator(object):
   """A .h generator for a namespace.
   """
   def __init__(self, namespace, cpp_type_generator):
     self._cpp_type_generator = cpp_type_generator
     self._namespace = namespace
     self._target_namespace = (
         self._cpp_type_generator.GetCppNamespaceName(self._namespace))
@@ skipping 84 matching lines @@
     """Generates the list of types in the current namespace in an order in which
     depended-upon types appear before types which depend on them.
     """
     dependency_order = []
 
     def ExpandType(path, type_):
       if type_ in path:
         raise ValueError("Illegal circular dependency via cycle " +
                          ", ".join(map(lambda x: x.name, path + [type_])))
       for prop in type_.properties.values():
-        if not prop.optional and prop.type_ == PropertyType.REF:
+        if prop.type_ == PropertyType.REF and ((not '.' in prop.ref_type) or
+            prop.ref_type.startswith(self._namespace.name + '.')):

[not at google - send to devlin, 2012/06/04 04:16:49]

Perhaps add GetSchemaNamespace to schema_util.py then compare that to
self._namespace.name?

nit: also try not to break up expressions over multiple lines like this, and if
you do then make logical components line up vertically.  Easier to read.

[benjhayden, 2012/06/04 20:33:15]

Done.

           ExpandType(path + [type_], self._namespace.types[prop.ref_type])
       if not type_ in dependency_order:
         dependency_order.append(type_)
 
     for type_ in self._namespace.types.values():
       ExpandType([], type_)
     return dependency_order
 
   def _GenerateEnumDeclaration(self, enum_name, prop, values):
     """Generate the declaration of a C++ enum for the given property and
@@ skipping 46 matching lines @@
       if type_.description:
         c.Comment(type_.description)
       c.Append('typedef std::vector<%(item_type)s> %(classname)s;')
       c.Substitute({'classname': classname, 'item_type':
           self._cpp_type_generator.GetType(type_.item_type,
                                            wrap_optional=True)})
     elif type_.type_ == PropertyType.STRING:
       if type_.description:
         c.Comment(type_.description)
       c.Append('typedef std::string %(classname)s;')
       c.Substitute({'classname': classname})

[not at google - send to devlin, 2012/06/04 04:16:49]

mind deleting the above line while you're here?

[benjhayden, 2012/06/04 20:33:15]

Done.

+    elif type_.type_ == PropertyType.INTEGER:
+      if type_.description:
+        c.Comment(type_.description)
+      # TODO: c.Sblock('enum %(classname)s {') ... .Eblock('};')

[not at google - send to devlin, 2012/06/04 04:16:49]

Please expand on this TODO: add your name, and explain what doing that code
snippet would achieve and why you'd want to do it.

Or just do it now...?

[benjhayden, 2012/06/04 20:33:15]

Done.

+      c.Append('typedef int %(classname)s;')
     else:
       if type_.description:
         c.Comment(type_.description)
       (c.Sblock('struct %(classname)s {')
           .Append('~%(classname)s();')
           .Append('%(classname)s();')
           .Append()
           .Concat(self._GeneratePropertyStructures(type_.properties.values()))
           .Concat(self._GenerateFields(type_.properties.values()))
       )
@@ skipping 104 matching lines @@
           c.Comment(param.description)
         if param.type_ == PropertyType.ANY:
           c.Comment("Value* Result::Create(Value*) not generated "
                     "because it's redundant.")
           continue
         c.Append('Value* Create(const %s);' % cpp_util.GetParameterDeclaration(
             param, self._cpp_type_generator.GetType(param)))
     c.Eblock('};')
 
     return c