Dart: Refactors Proxies

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

 # Copyright 2014 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 errno
 import os
 import re
 import shutil
 import sys
 
 import mojom.fileutil as fileutil
 import mojom.generate.constant_resolver as resolver
 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
 
 GENERATOR_PREFIX = 'dart'
 
 # CAUTION: To generate Dart-style names, and to avoid generating reserved words
-# for identifiers. The template files should generate names using
+# for identifiers, the template files should generate names using
 # {{element|name}}, not {{element.name}}.
 
 # Dart reserved words from:
 # http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-408.pdf
-# We must not generated reserved words for identifiers.
+# We must not generate reserved words for identifiers.
 # NB: async, await, and yield are not technically reserved words, but since
 # they are not valid identifiers in all contexts, we include them here as well.
 _dart_reserved_words = [
   "assert",
   "async",
   "await",
   "break",
   "case",
   "catch",
   "class",
@@ skipping 21 matching lines @@
   "throw",
   "true",
   "try",
   "var",
   "void",
   "while",
   "with",
   "yield",
 ]
 
+# These names are the class fields and methods of the Proxy class in
+# lib/src/proxy.dart of Dart's mojo package. If these names appear in a .mojom
+# they must be mangled to avoid name conflicts. They are mangled by appending
+# an underscore ('_'), which is banned on names in mojom interfaces.
 _reserved_words = _dart_reserved_words + [
+  "close",
+  "connectToService",
+  "ctrl",
+  "fromEndpoint",
+  "fromHandle",
+  "newFromEndpoint",
+  "responseOrError",
   "serviceName",
+  "unbound",
 ]
 
 _kind_to_dart_default_value = {
   mojom.BOOL:                  "false",
   mojom.INT8:                  "0",
   mojom.UINT8:                 "0",
   mojom.INT16:                 "0",
   mojom.UINT16:                "0",
   mojom.INT32:                 "0",
   mojom.UINT32:                "0",
@@ skipping 550 matching lines @@
         interface_to_import[name] = each_import["unique_name"] + "." + name
     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