Merging dart:html interfaces and implementations

sdk/lib/html/scripts/generator.py

 #!/usr/bin/python
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. 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 provides shared functionality for systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import re
@@ skipping 427 matching lines @@
     else:
       return '\n'
   return ''.join(FormatLine(line) for line in text.split('\n'))
 
 # Given a sorted sequence of type identifiers, return an appropriate type
 # name
 def TypeName(type_ids, interface):
   # Dynamically type this field for now.
   return 'dynamic'
 
-def ImplementationClassNameForInterfaceName(interface_name):
-  return '_%sImpl' % interface_name
-
 # ------------------------------------------------------------------------------
 
 class Conversion(object):
   """Represents a way of converting between types."""
   def __init__(self, name, input_type, output_type):
     # input_type is the type of the API input (and the argument type of the
     # conversion function)
     # output_type is the type of the API output (and the result type of the
     # conversion function)
     self.function_name = name
@@ skipping 218 matching lines @@
       return 'List<Node>'
     if self.list_item_type() and not self.has_generated_interface():
       return 'List<%s>' % self._type_registry.TypeInfo(self._data.item_type).dart_type()
     return self._data.dart_type or self._dart_interface_name
 
   def narrow_dart_type(self):
     # TODO(podivilov): why NodeList is special?
     if self.idl_type() == 'NodeList':
       return 'List<Node>'
     if self.list_item_type():
-      return ImplementationClassNameForInterfaceName(self.idl_type())
+      return self.idl_type()
     # TODO(podivilov): only primitive and collection types should override
     # dart_type.
     if self._data.dart_type != None:
       return self.dart_type()
     if IsPureInterface(self.idl_type()):
       return self.idl_type()
-    return ImplementationClassNameForInterfaceName(self.interface_name())
+    return self.interface_name()
 
   def interface_name(self):
     if self.list_item_type() and not self.has_generated_interface():
       return self.dart_type()
     return self._dart_interface_name
 
   def implementation_name(self):
     if self.list_item_type():
-      return ImplementationClassNameForInterfaceName(self.idl_type())
-    implementation_name = ImplementationClassNameForInterfaceName(
-        self.interface_name())
+      implementation_name = self.idl_type()
+    else:
+      implementation_name = self.interface_name()
     if self.merged_into():
       implementation_name = '%s_Merged' % implementation_name
+
+    if not self.has_generated_interface():
+      implementation_name = '_%s' % implementation_name
+
     return implementation_name
 
   def has_generated_interface(self):
     return not self._data.suppress_interface
 
   def list_item_type(self):
     return self._data.item_type
 
   def is_typed_array(self):
     return self._data.is_typed_array
@@ skipping 371 matching lines @@
       else:
         dart_interface_name = type_name
       return InterfaceIDLTypeInfo(type_name, type_data, dart_interface_name,
                                   self)
 
     if type_data.clazz == 'SVGTearOff':
       return SVGTearOffIDLTypeInfo(type_name, type_data, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)