Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/public/tools/bindings/generators/mojom_dart_generator.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.
 
 """Generates Dart source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 137 matching lines @@
 def CodecType(kind):
   if kind in mojom.PRIMITIVES:
     return _kind_to_codec_type[kind]
   if mojom.IsStructKind(kind):
     pointer_type = "NullablePointerTo" if mojom.IsNullableKind(kind) \
         else "PointerTo"
     return "new bindings.%s(%s)" % (pointer_type, DartType(kind))
   if mojom.IsArrayKind(kind):
     array_type = "NullableArrayOf" if mojom.IsNullableKind(kind) else "ArrayOf"
     array_length = "" if kind.length is None else ", %d" % kind.length
-    element_type = "bindings.PackedBool" if mojom.IsBoolKind(kind.kind) \
-        else CodecType(kind.kind)
+    element_type = ElementCodecType(kind.kind)
     return "new bindings.%s(%s%s)" % (array_type, element_type, array_length)
   if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
     return CodecType(mojom.MSGPIPE)
   if mojom.IsEnumKind(kind):
     return _kind_to_codec_type[mojom.INT32]
+  if mojom.IsMapKind(kind):
+    map_type = "NullableMapOf" if mojom.IsNullableKind(kind) else "MapOf"
+    key_type = ElementCodecType(kind.key_kind)
+    value_type = ElementCodecType(kind.value_kind)
+    return "new bindings.%s(%s, %s)" % (map_type, key_type, value_type)
   return kind
 
-def MapCodecType(kind):
+def ElementCodecType(kind):
   return "bindings.PackedBool" if mojom.IsBoolKind(kind) else CodecType(kind)
 
 def DartDecodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
     return "decodeStruct(%s)" % CodecType(kind)
   if mojom.IsStructKind(kind):
     return "decodeStructPointer(%s)" % DartType(kind)
   if mojom.IsMapKind(kind):
     return "decodeMapPointer(%s, %s)" % \
-        (MapCodecType(kind.key_kind), MapCodecType(kind.value_kind))
+        (ElementCodecType(kind.key_kind), ElementCodecType(kind.value_kind))
   if mojom.IsArrayKind(kind) and mojom.IsBoolKind(kind.kind):
     return "decodeArrayPointer(bindings.PackedBool)"
   if mojom.IsArrayKind(kind):
     return "decodeArrayPointer(%s)" % CodecType(kind.kind)
   if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
     return DartDecodeSnippet(mojom.MSGPIPE)
   if mojom.IsEnumKind(kind):
     return DartDecodeSnippet(mojom.INT32)
 
 
 def DartEncodeSnippet(kind):
   if kind in mojom.PRIMITIVES:
     return "encodeStruct(%s, " % CodecType(kind)
   if mojom.IsStructKind(kind):
     return "encodeStructPointer(%s, " % DartType(kind)
   if mojom.IsMapKind(kind):
     return "encodeMapPointer(%s, %s, " % \
-        (MapCodecType(kind.key_kind), MapCodecType(kind.value_kind))
+        (ElementCodecType(kind.key_kind), ElementCodecType(kind.value_kind))
   if mojom.IsArrayKind(kind) and mojom.IsBoolKind(kind.kind):
     return "encodeArrayPointer(bindings.PackedBool, ";
   if mojom.IsArrayKind(kind):
     return "encodeArrayPointer(%s, " % CodecType(kind.kind)
   if mojom.IsInterfaceKind(kind) or mojom.IsInterfaceRequestKind(kind):
     return DartEncodeSnippet(mojom.MSGPIPE)
   if mojom.IsEnumKind(kind):
     return DartEncodeSnippet(mojom.INT32)
 
 
@@ skipping 45 matching lines @@
   def GetParameters(self):
     return {
       "namespace": self.module.namespace,
       "imports": self.GetImports(),
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "module": self.module,
       "structs": self.GetStructs() + self.GetStructsFromMethods(),
       "interfaces": self.module.interfaces,
       "imported_interfaces": self.GetImportedInterfaces(),
+      "imported_from": self.ImportedFrom(),
     }
 
   @UseJinja("dart_templates/module.lib.tmpl", filters=dart_filters)
   def GenerateLibModule(self):
     return self.GetParameters()
 
   def GenerateFiles(self, args):
     self.Write(self.GenerateLibModule(),
         self.MatchMojomFilePath("%s.dart" % self.module.name))
 
   def GetImports(self):
     used_names = set()
     for each_import in self.module.imports:
       simple_name = each_import["module_name"].split(".")[0]
 
       # Since each import is assigned a variable in JS, they need to have unique
       # names.
       unique_name = simple_name
       counter = 0
       while unique_name in used_names:
         counter += 1
         unique_name = simple_name + str(counter)
 
       used_names.add(unique_name)
       each_import["unique_name"] = unique_name
       counter += 1
     return self.module.imports
 
   def GetImportedInterfaces(self):
-    interface_to_import = {};
+    interface_to_import = {}
     for each_import in self.module.imports:
       for each_interface in each_import["module"].interfaces:
         name = each_interface.name
         interface_to_import[name] = each_import["unique_name"] + "." + name
-    return interface_to_import;
+    return interface_to_import
+
+  def ImportedFrom(self):
+    interface_to_import = {}
+    for each_import in self.module.imports:
+      for each_interface in each_import["module"].interfaces:
+        name = each_interface.name
+        interface_to_import[name] = each_import["unique_name"] + "."
+    return interface_to_import