Merging dart:html interfaces and implementations

sdk/lib/html/scripts/generator.py

Index: sdk/lib/html/scripts/generator.py
diff --git a/sdk/lib/html/scripts/generator.py b/sdk/lib/html/scripts/generator.py
index a7332a9e5ba5882f4b1f143d258a8147262bbed1..343174f37f8ccecccfa995758dbf61235f30c485 100644
--- a/sdk/lib/html/scripts/generator.py
+++ b/sdk/lib/html/scripts/generator.py
@@ -446,7 +446,7 @@ def TypeName(type_ids, interface):
   return 'dynamic'
 
 def ImplementationClassNameForInterfaceName(interface_name):
-  return '_%sImpl' % interface_name
+  return interface_name

[Anton Muhin, 2012/11/06 12:28:43]

there are only 4 usages of this method and you already touch two of those, maybe
just inline it?

[blois, 2012/11/06 22:11:44]

Done.

 
 # ------------------------------------------------------------------------------
 
@@ -702,11 +702,17 @@ class InterfaceIDLTypeInfo(IDLTypeInfo):
 
   def implementation_name(self):
     if self.list_item_type():
-      return ImplementationClassNameForInterfaceName(self.idl_type())
-    implementation_name = ImplementationClassNameForInterfaceName(
-        self.interface_name())
+      implementation_name = ImplementationClassNameForInterfaceName(
+          self.idl_type())
+    else:
+      implementation_name = ImplementationClassNameForInterfaceName(
+          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):