Generate Mojom Types in Dart (Take 2)

mojo/public/tools/bindings/generators/mojom_go_generator.py

 # 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.
 
 '''Generates Go source files from a mojom.Module.'''
 
 from itertools import chain
 import os
 import re
 
@@ skipping 289 matching lines @@
   path = GetPackagePath(imported['module'])
   if path in imports:
     return
   name = GetPackageName(imported['module'])
   while name in imports.values(): # This avoids repeated names.
     name += '_'
   imported['go_name'] = name
   imports[path] = name
   mojom_imports[path] = name
 
-def GetIdentifier(kind):
-  """Use the kind's module to determine the package and name."""
+# Get the mojom type's identifier suffix.
+def GetMojomTypeIdentifier(kind):
+  """Get the mojom type's unique identifier from the kind's package and name."""
   # Note: InterfaceRequest's should use the Interface inside them.
   if hasattr(kind, 'module'):
     package = GetPackageName(kind.module)
     name = kind.name
   elif mojom.IsInterfaceRequestKind(kind):
     package = GetPackageName(kind.kind.module)
     name = kind.kind.name
   else:
     # These kinds (e.g., simple kinds, maps, and arrays) lack identifiers.
     raise Exception('Unexpected kind: %s' % kind)
-
-  return '%s_%s' % (package, name)
-
-# Get the mojom type's identifier suffix.
-def GetMojomTypeIdentifier(kind):
-  # Since this should be unique, it is based on the type's identifier.
-  return "%s__" % GetIdentifier(kind)
+  return "%s_%s__" % (package, name)
 
 class Generator(generator.Generator):
   go_filters = {
     'array': lambda kind: mojom.Array(kind),
     'bit_size': GetBitSize,
     'decode_suffix': DecodeSuffix,
     'encode_suffix': EncodeSuffix,
     'go_type': GetGoType,
     'expression_to_text': ExpressionToText,
     'has_response': lambda method: method.response_parameters is not None,
-    'identifier': GetIdentifier,
     'is_array': mojom.IsArrayKind,
     'is_enum': mojom.IsEnumKind,
     'is_handle': mojom.IsAnyHandleKind,
     'is_interface': mojom.IsInterfaceKind,
     'is_interface_request': mojom.IsInterfaceRequestKind,
     'is_map': mojom.IsMapKind,
     'is_none_or_empty': lambda array: array is None or len(array) == 0,
     'is_nullable': mojom.IsNullableKind,
     'is_pointer': IsPointer,
     'is_object': mojom.IsObjectKind,
@@ skipping 137 matching lines @@
   # Overrides the implementation from the base class in order to customize the
   # struct and field names.
   def _GetResponseStructFromMethod(self, method):
     params_class = "%s_%s_ResponseParams" % (
         GetNameForElement(method.interface), GetNameForElement(method))
     struct = mojom.Struct(params_class, module=method.interface.module)
     for param in method.response_parameters:
       struct.AddField("out%s" % GetNameForElement(param),
           param.kind, param.ordinal, attributes=param.attributes)
     return self._AddStructComputedData(False, struct)