Docserver: Display enum value descriptions in API docs.

tools/json_schema_compiler/cc_generator.py

Index: tools/json_schema_compiler/cc_generator.py
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index 9935e1cc399f5dedad799a64eb72fe888a00cf2b..ce2dc63e18abb97cb74d7a01a9d1d6c682734344 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -784,7 +784,9 @@ class _Generator(object):
                                  self._type_helper.GetEnumNoneValue(type_)))
       .Concat(self._GenerateError(
         '\"\'%%(key)s\': expected \\"' +
-        '\\" or \\"'.join(self._type_helper.FollowRef(type_).enum_values) +
+        '\\" or \\"'.join(
+            enum_value['name']
+            for enum_value in self._type_helper.FollowRef(type_).enum_values) +
         '\\", got \\"" + %s + "\\""' % enum_as_string))
       .Append('return %s;' % failure_value)
       .Eblock('}')
@@ -819,8 +821,9 @@ class _Generator(object):
                  (maybe_namespace, classname))
     c.Sblock('switch (enum_param) {')
     for enum_value in self._type_helper.FollowRef(type_).enum_values:
-      (c.Append('case %s: ' % self._type_helper.GetEnumValue(type_, enum_value))
-        .Append('  return "%s";' % enum_value))
+      (c.Append('case %s: ' % self._type_helper.GetEnumValue(
+          type_, enum_value['name']))
+        .Append('  return "%s";' % enum_value['name']))
     (c.Append('case %s:' % self._type_helper.GetEnumNoneValue(type_))
       .Append('  return "";')
       .Eblock('}')
@@ -848,9 +851,9 @@ class _Generator(object):
       # This is broken up into all ifs with no else ifs because we get
       # "fatal error C1061: compiler limit : blocks nested too deeply"
       # on Windows.
-      (c.Append('if (enum_string == "%s")' % enum_value)
+      (c.Append('if (enum_string == "%s")' % enum_value['name'])
         .Append('  return %s;' %
-            self._type_helper.GetEnumValue(type_, enum_value)))
+            self._type_helper.GetEnumValue(type_, enum_value['name'])))
     (c.Append('return %s;' % self._type_helper.GetEnumNoneValue(type_))
       .Eblock('}')
     )