Handle contained declarations for interfaces and structs.

mojo/public/tools/bindings/pylib/mojom/generate/mojom_translator.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 #
 # This module is responsible for translating a MojomFileGraph (see
 # mojom_files.mojom) to one or more module.Module.
 #
 # This module takes the output of the mojom parser, a MojomFileGraph  and
 # translates it to the input of the code generators, a module.Module object.
@@ skipping 127 matching lines @@
 
     Args:
       struct: {module.Struct} to be populated.
       mojom_type: {UserDefinedType} referring to the MojomStruct to be
         translated.
     """
     assert mojom_type.tag == mojom_types_mojom.UserDefinedType.Tags.struct_type
     mojom_struct = mojom_type.struct_type
     self.PopulateUserDefinedType(struct, mojom_struct)
     struct.fields = [self.StructFieldFromMojom(f) for f in mojom_struct.fields]
-    # TODO(azani): Handle mojom_struct.decl_data.contained_declarations.
+    self.PopulateContainedDeclarationsFromMojom(
+        struct, mojom_struct.decl_data.contained_declarations)
 
   def UnionFieldFromMojom(self, mojom_field):
     """Translates a mojom_types_mojom.UnionField to a module.UnionField.
 
     Args:
       mojom_field: {mojom_types_mojom.UnionField} to be translated.
 
     Returns:
       {module.UnionField} translated from mojom_field.
     """
@@ skipping 45 matching lines @@
     """Populates a number of common field values based on a mojom field.
 
     Args:
       field: {module.Field|module.Parameter} to be populated.
       mojom_field: {StructField|UnionField} to be translated.
     """
     field.name = mojom_field.decl_data.short_name
     field.kind = self.KindFromMojom(mojom_field.type)
     field.attributes = self.AttributesFromMojom(mojom_field)
 
-  def EnumFromMojom(self, enum, mojom_type, parent_kind=None):
+  def PopulateContainedDeclarationsFromMojom(
+      self, parent_kind, contained_declarations):
+    """Populates a module.Struct|module.Interface with contained declarations.
+
+    Args:
+      parent_kind: {module.Struct|module.Interface} to be populated.
+      contained_declarations: {mojom_types_mojom.ContainedDeclarations} from
+        which the contained types need to be extracted.
+    """
+    if not contained_declarations:
+      return
+
+    if contained_declarations.enums:
+      for enum_key in contained_declarations.enums:
+        enum = self.UserDefinedFromTypeKey(enum_key)
+        enum.name = '%s.%s' % (parent_kind.name, enum.name)
+        enum.parent_kind = parent_kind
+        parent_kind.enums.append(enum)
+
+    if contained_declarations.constants:
+      for const_key in contained_declarations.constants:
+        const = self.ConstFromMojom(
+            self._graph.resolved_values[const_key].declared_constant,
+            parent_kind)
+        parent_kind.constants.append(const)
+
+  def EnumFromMojom(self, enum, mojom_type):
     """Populates a module.Enum based on a MojomEnum.
 
     Args:
       enum: {module.Enum} to be populated.
       mojom_type: {mojom_types_mojom.Type} referring to the MojomEnum to be
         translated.
-      parent_kind: {MojomStruct|MojomInterface} in which the enum is nested.
     """
     assert mojom_type.tag == mojom_types_mojom.UserDefinedType.Tags.enum_type
     mojom_enum = mojom_type.enum_type
-    enum.parent_kind = parent_kind
     self.PopulateUserDefinedType(enum, mojom_enum)
     enum.fields = [self.EnumFieldFromMojom(value)
         for value in mojom_enum.values]
 
   def EnumFieldFromMojom(self, mojom_field):
     """Translates an mojom_types_mojom.EnumValue to a module.EnumField.
 
     mojom_field: {mojom_types_mojom.EnumValue} to be translated.
 
     Returns:
@@ skipping 72 matching lines @@
         translated.
     """
     assert (mojom_type.tag
         == mojom_types_mojom.UserDefinedType.Tags.interface_type)
     mojom_interface = mojom_type.interface_type
     interface.attributes = self.AttributesFromMojom(mojom_interface)
     self.PopulateModuleOrImportedFrom(interface, mojom_interface)
     interface.name = mojom_interface.interface_name
     interface.methods = [self.MethodFromMojom(mojom_method, interface)
         for mojom_method in mojom_interface.methods.itervalues()]
+    self.PopulateContainedDeclarationsFromMojom(
+        interface, mojom_interface.decl_data.contained_declarations)
 
   def MethodFromMojom(self, mojom_method, interface):
     """Translates a mojom_types_mojom.MojomMethod to a module.Method.
 
     Args:
       mojom_method: {mojom_types_mojom.MojomMethod} to be translated.
       interface: {module.Interface} the method is a member of.
 
     Returns:
       {module.Method} translated from mojom_method.
@@ skipping 266 matching lines @@
 
   Args:
     graph: {mojom_types_mojom.MojomFileGraph} to be translated.
 
   Return:
     {dict<str, module.Module>} mapping the file's name to its module.Module
     translation for all files in graph.files.
   """
   return {file_name: FileTranslator(graph, file_name).Translate()
       for file_name in graph.files}