Fix a bug with mojom imports where 2 imports with the same namespace would

mojo/public/bindings/pylib/generate/mojom_data.py

 # Copyright 2013 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.
 
 import mojom
 
 # mojom_data provides a mechanism to turn mojom Modules to dictionaries and
 # back again. This can be used to persist a mojom Module created progromatically
 # or to read a dictionary from code or a file.
 # Example:
@@ skipping 36 matching lines @@
     return kinds[data]
   if data.startswith('a:'):
     kind = mojom.Array()
     kind.kind = KindFromData(kinds, data[2:])
   else:
     kind = mojom.Kind()
   kind.spec = data
   kinds[data] = kind
   return kind
 
-def ImportFromData(data):
+def ImportFromData(module, data):
   import_module = data['module']
 
   import_item = {}
   import_item['module_name'] = import_module.name
   import_item['namespace'] = import_module.namespace
+
+  # Copy the struct kinds from our imports into the current module.
+  for kind in import_module.kinds.itervalues():
+    # TODO(mpcomplete): Handle enums
+    if isinstance(kind, mojom.Struct) and kind.imported_from is None:
+      kind = mojom.Struct.CreateFromImport(kind, import_item)
+      module.kinds[kind.spec] = kind
   return import_item
 
 def StructToData(struct):
   return {
     istr(0, 'name'): struct.name,
     istr(1, 'fields'): map(FieldToData, struct.fields)
   }
 
 def StructFromData(module, data):
   struct = mojom.Struct()
@@ skipping 102 matching lines @@
     istr(1, 'namespace'):  module.namespace,
     istr(2, 'structs'):    map(StructToData, module.structs),
     istr(3, 'interfaces'): map(InterfaceToData, module.interfaces)
   }
 
 def ModuleFromData(data):
   module = mojom.Module()
   module.kinds = {}
   for kind in mojom.PRIMITIVES:
     module.kinds[kind.spec] = kind
-  # Copy the struct kinds from our imports into the current module.
-  for import_data in data['imports']:
-    import_module = import_data['module']
-    for kind in import_module.kinds.itervalues():
-      # TODO(mpcomplete): Handle enums
-      if isinstance(kind, mojom.Struct):
-        kind = mojom.Struct.CreateFromImport(
-            kind, import_module.namespace)
-        module.kinds[kind.spec] = kind
 
   module.name = data['name']
   module.namespace = data['namespace']
+  # Imports must come first, because they add to module.kinds which is used
+  # by by the others.
   module.imports = map(
-      lambda import_data: ImportFromData(import_data), data['imports'])
+      lambda import_data: ImportFromData(module, import_data),
+      data['imports'])
   module.structs = map(
       lambda struct: StructFromData(module, struct), data['structs'])
   module.interfaces = map(
-      lambda interface:
-          InterfaceFromData(module, interface), data['interfaces'])
+      lambda interface: InterfaceFromData(module, interface),
+      data['interfaces'])
   if data.has_key('enums'):
     module.enums = map(
         lambda enum: EnumFromData(module.kinds, enum), data['enums'])
   return module
 
 def OrderedModuleFromData(data):
   module = ModuleFromData(data)
   next_interface_ordinal = 0
   for interface in module.interfaces:
     next_ordinal = 0
     for method in interface.methods:
       if method.ordinal is None:
         method.ordinal = next_ordinal
       next_ordinal = method.ordinal + 1
   return module