Fix compile error if both inline and reference enums are used in a type.

tools/json_schema_compiler/cc_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
 import util_cc_helper
 
@@ skipping 479 matching lines @@
       else:
         return '(%s).ToValue().release()' % var
     elif (underlying_type.property_type == PropertyType.ANY or
           underlying_type.property_type == PropertyType.FUNCTION):
       if is_ptr:
         vardot = '(%s)->' % var
       else:
         vardot = '(%s).' % var
       return '%sDeepCopy()' % vardot
     elif underlying_type.property_type == PropertyType.ENUM:
-      classname = cpp_util.Classname(schema_util.StripNamespace(
-          underlying_type.name))
-      return 'new base::StringValue(%sToString(%s))' % (classname, var)
+      maybe_namespace = ''
+      if type_.property_type == PropertyType.REF:
+        maybe_namespace = '%s::' % underlying_type.namespace.unix_name
+      return 'new base::StringValue(%sToString(%s))' % (maybe_namespace, var)
     elif underlying_type.property_type == PropertyType.BINARY:
       if is_ptr:
         vardot = var + '->'
       else:
         vardot = var + '.'
       return ('base::BinaryValue::CreateWithCopiedBuffer(%sdata(), %ssize())' %
               (vardot, vardot))
     elif underlying_type.property_type == PropertyType.ARRAY:
       return '%s.release()' % self._util_cc_helper.CreateValueFromArray(
           cpp_namespace,
@@ skipping 368 matching lines @@
   def _GenerateEnumToString(self, cpp_namespace, type_):
     """Generates ToString() which gets the string representation of an enum.
     """
     c = Code()
     classname = cpp_util.Classname(schema_util.StripNamespace(type_.name))
 
     if cpp_namespace is not None:
       c.Append('// static')
     maybe_namespace = '' if cpp_namespace is None else '%s::' % cpp_namespace
 
-    c.Sblock('std::string %s%sToString(%s enum_param) {' %
-                 (maybe_namespace, classname, classname))
+    c.Sblock('std::string %sToString(%s enum_param) {' %
+                 (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.name))
     (c.Append('case %s:' % self._type_helper.GetEnumNoneValue(type_))
       .Append('  return "";')
       .Eblock('}')
       .Append('NOTREACHED();')
       .Append('return "";')
       .Eblock('}')
     )
-
-    (c.Append()
-      .Sblock('std::string %sToString(%s enum_param) {' %
-                  (maybe_namespace, classname))
-      .Append('return %s%sToString(enum_param);' % (maybe_namespace, classname))
-      .Eblock('}'))
     return c
 
   def _GenerateEnumFromString(self, cpp_namespace, type_):
     """Generates FromClassNameString() which gets an enum from its string
     representation.
     """
     c = Code()
     classname = cpp_util.Classname(schema_util.StripNamespace(type_.name))
 
     if cpp_namespace is not None:
@@ skipping 98 matching lines @@
     if self._generate_error_messages:
       params = list(params) + ['base::string16* error']
     return ', '.join(str(p) for p in params)
 
   def _GenerateArgs(self, args):
     """Builds the argument list for a function, given an array of arguments.
     """
     if self._generate_error_messages:
       args = list(args) + ['error']
     return ', '.join(str(a) for a in args)