Docserver: Display enum value descriptions in API docs.

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 schema_util
 
 class HGenerator(object):
@@ skipping 126 matching lines @@
       ExpandType([], type_)
     return dependency_order
 
   def _GenerateEnumDeclaration(self, enum_name, type_):
     """Generate the declaration of a C++ enum.
     """
     c = Code()
     c.Sblock('enum %s {' % enum_name)
     c.Append(self._type_helper.GetEnumNoneValue(type_) + ',')
     for value in type_.enum_values:
-      c.Append(self._type_helper.GetEnumValue(type_, value) + ',')
+      c.Append(self._type_helper.GetEnumValue(type_, value['name']) + ',')

[not at google - send to devlin, 2013/10/28 18:00:25]

maybe GetEnumValue should take the enum not enum['name']

[Sam McNally, 2013/10/29 00:39:02]

Done.

     return c.Eblock('};')
 
   def _GenerateFields(self, props):
     """Generates the field declarations when declaring a type.
     """
     c = Code()
     needs_blank_line = False
     for prop in props:
       if needs_blank_line:
         c.Append()
@@ skipping 43 matching lines @@
       if generate_typedefs:
         if type_.description:
           c.Comment(type_.description)
         c.Append('typedef std::string %(classname)s;')
     elif type_.property_type == PropertyType.ENUM:
       if type_.description:
         c.Comment(type_.description)
       c.Sblock('enum %(classname)s {')
       c.Append('%s,' % self._type_helper.GetEnumNoneValue(type_))
       for value in type_.enum_values:
-        c.Append('%s,' % self._type_helper.GetEnumValue(type_, value))
+        c.Append('%s,' % self._type_helper.GetEnumValue(type_, value['name']))
       # Top level enums are in a namespace scope so the methods shouldn't be
       # static. On the other hand, those declared inline (e.g. in an object) do.
       maybe_static = '' if is_toplevel else 'static '
       (c.Eblock('};')
         .Append()
         .Append('%sstd::string ToString(%s as_enum);' %
                     (maybe_static, classname))
         .Append('%s%s Parse%s(const std::string& as_string);' %
                     (maybe_static, classname, classname))
       )
@@ skipping 166 matching lines @@
       .Append('}  // namespace Results')
     )
     return c
 
   def _GenerateParams(self, params):
     """Builds the parameter list for a function, given an array of parameters.
     """
     if self._generate_error_messages:
       params += ('base::string16* error = NULL',)
     return ', '.join(str(p) for p in params)