Support scoped types in PPAPI IDL.

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 668 matching lines @@
       )
       if is_ptr and self._generate_error_messages:
         c.Append('%(dst_var)s.reset();')
       else:
         c.Append('return %(failure_value)s;')
       c.Eblock('}')
       c.Sblock('else {')
       item_type = self._type_helper.FollowRef(underlying_type.item_type)
       if item_type.property_type == PropertyType.ENUM:
         c.Concat(self._GenerateListValueToEnumArrayConversion(
-                     item_type,
+                     underlying_type.item_type,
                      'list',
                      dst_var,
                      failure_value,
                      is_ptr=is_ptr))
       else:
         (c.Sblock('if (!%s) {' % self._util_cc_helper.PopulateArrayFromList(
               underlying_type,
               'list',
               dst_var,
               is_ptr)))
@@ skipping 82 matching lines @@
       .Concat(self._GenerateStringToEnumConversion(item_type,
                                                    '(*it)',
                                                    'tmp',
                                                    failure_value))
       .Append('%s%spush_back(tmp);' % (dst_var, accessor))
       .Eblock('}')
     )
     return c
 
   def _GenerateStringToEnumConversion(self,
                                       type_,

[not at google - send to devlin, 2014/03/31 15:18:59]

can you just pass in the correct underlying type here? i.e. call
_GenerateStringToEnumVersion with FollowRef(type_) rather than just type_? and
assert that the type that gets passed into here is an enum?

[mtomasz, 2014/04/03 21:50:22]

Done.

                                       src_var,
                                       dst_var,
                                       failure_value):
     """Returns Code that converts a string type in |src_var| to an enum with
     type |type_| in |dst_var|. In the generated code, if |src_var| is not
     a valid enum name then the function will return |failure_value|.
     """
     c = Code()
     enum_as_string = '%s_as_string' % type_.unix_name
+    cpp_type_fullname = self._type_helper.GetCppType(type_)

[not at google - send to devlin, 2014/03/31 15:18:59]

this isn't used

[mtomasz, 2014/04/03 21:50:22]

Done.

+    # The passed type may be either of REF type, or directly ENUM. Note, that
+    # the second case is used only by JSON.
+    enum_type = (type_ if type_.property_type == PropertyType.ENUM else

[not at google - send to devlin, 2014/03/31 15:18:59]

see comment above, note that FollowRef does this check already (i.e. this should
be the same as just enum_type = self._type_helper.FollowRef(type_) without the
extra ternary-if)

[mtomasz, 2014/04/03 21:50:22]

Done.

+                 self._type_helper.FollowRef(type_))
+    cpp_type_namespace = (enum_type.namespace.unix_name

[not at google - send to devlin, 2014/03/31 15:18:59]

if you make sure this includes the '::' then that will simplify the code below.

also, ternary-if is pretty awkward syntax in python and rarely appropriate. I
would prefer if you wrote it as

cpp_type_namespace = ''
if enum_type.namespace:
  cpp_type_namespace = enum_type.namespace + '::'

[Nils Barth (inactive), 2014/04/01 01:39:16]

BTW, as a style point, an alternative style is single assignment
with the conditional expression expanded:
if enum_type.namespace:
  cpp_type_namespace = enum_type.namespace + '::'
else:
  cpp_type_namespace = ''

(We use this is Blink bindings generation, but of course style should
agree with surrounding code, so should follow Ben's style rec.)

[not at google - send to devlin, 2014/04/01 01:40:25]

I don't mind either way.

[mtomasz, 2014/04/03 21:50:22]

Done.

+        if enum_type.namespace != self._namespace else '')
+    cpp_type_name = self._type_helper.GetCppType(enum_type)

[not at google - send to devlin, 2014/03/31 15:18:59]

if you go back to inlining this, and implement the suggestion above, then the
code below hardly needs to change.

[mtomasz, 2014/04/03 21:50:22]

Done.

     (c.Append('std::string %s;' % enum_as_string)
       .Sblock('if (!%s->GetAsString(&%s)) {' % (src_var, enum_as_string))
       .Concat(self._GenerateError(
         '"\'%%(key)s\': expected string, got " + ' +
         self._util_cc_helper.GetValueTypeString('%%(src_var)s', True)))
       .Append('return %s;' % failure_value)
       .Eblock('}')
-      .Append('%s = Parse%s(%s);' % (dst_var,
-                                     self._type_helper.GetCppType(type_),
-                                     enum_as_string))
-      .Sblock('if (%s == %s) {' % (dst_var,
-                                 self._type_helper.GetEnumNoneValue(type_)))

[not at google - send to devlin, 2014/03/31 15:18:59]

if/when you do change this back, mind indenting this 2 spaces to align it
properly?

[mtomasz, 2014/04/03 21:50:22]

Done.

+      .Append('%s = %sParse%s(%s);' % (
+        dst_var,
+        cpp_type_namespace + '::' if cpp_type_namespace else '',
+        cpp_type_name,
+        enum_as_string))
+      .Sblock('if (%s == %s%s) {' % (
+        dst_var,
+        cpp_type_namespace + '::' if cpp_type_namespace else '',
+        self._type_helper.GetEnumNoneValue(type_)))
       .Concat(self._GenerateError(
         '\"\'%%(key)s\': expected \\"' +
         '\\" 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('}')
       .Substitute({'src_var': src_var, 'key': type_.name})
     )
@@ skipping 145 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)