Merging dart:html interfaces and implementations

sdk/lib/html/scripts/htmleventgenerator.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 functionality to generate dart:html event classes."""
 
 import logging
 
 _logger = logging.getLogger('dartgenerator')
@@ skipping 184 matching lines @@
     self._template_loader = template_loader
 
   def ProcessInterface(self, interface, html_interface_name, custom_events,
                        events_interface_emitter, events_implementation_emitter):
     events = set([attr for attr in interface.attributes
                   if attr.type.id == 'EventListener'])
     if not events and interface.id not in _html_explicit_event_classes:
       return None
 
     self._event_classes.add(interface.id)
-    events_interface = html_interface_name + 'Events'
+    events_class_name = html_interface_name + 'Events'
     parent_events_interface = self._GetParentEventsInterface(interface)
 
     if not events:
       return parent_events_interface
 
-    interface_events_members = events_interface_emitter.Emit(
-        '\nabstract class $INTERFACE implements $PARENT {\n$!MEMBERS}\n',
-        INTERFACE=events_interface,
-        PARENT=parent_events_interface)
-
-    template_file = 'impl_%s.darttemplate' % events_interface
+    template_file = 'impl_%s.darttemplate' % events_class_name
     template = (self._template_loader.TryLoad(template_file) or
         '\n'
-        'class $CLASSNAME extends $SUPER implements $INTERFACE {\n'
-        '  $CLASSNAME(_ptr) : super(_ptr);\n'
+        'class $CLASSNAME extends $SUPER {\n'
+        '  $CLASSNAME(EventTarget _ptr) : super(_ptr);\n'
         '$!MEMBERS}\n')
 
     # TODO(jacobr): specify the type of _ptr as EventTarget
     implementation_events_members = events_implementation_emitter.Emit(
         template,
-        CLASSNAME='_%sImpl' % events_interface,
-        INTERFACE=events_interface,
-        SUPER='_%sImpl' % parent_events_interface)
+        CLASSNAME=events_class_name,
+        SUPER='%s' % parent_events_interface)
 
     dom_event_names = set()
     for event in events:
       dom_name = event.id[2:]
       dom_name = _on_attribute_to_event_name_mapping.get(dom_name, dom_name)
       dom_event_names.add(dom_name)
     if html_interface_name in _html_manual_events:
       dom_event_names.update(_html_manual_events[html_interface_name])
     for dom_name in sorted(dom_event_names):
       if dom_name not in _html_event_names:
         _logger.warn('omitting %s event as there is no HTML name for it' % dom_name)
         continue
 
       html_name = _html_event_names[dom_name]
-      interface_events_members.Emit('\n  EventListenerList get $NAME;\n',
-          NAME=html_name)
       full_event_name = '%sEvents.%s' % (html_interface_name, html_name)
       if not full_event_name in custom_events:
         implementation_events_members.Emit(
             "\n"
             "  EventListenerList get $NAME => this['$DOM_NAME'];\n",
             NAME=html_name,
             DOM_NAME=dom_name)
 
-    return events_interface
+    return events_class_name
 
   # TODO(jacobr): this isn't quite right....
   def _GetParentEventsInterface(self, interface):
     # Ugly hack as we don't specify that Document and DocumentFragment inherit
     # from Element in our IDL.
     if interface.id == 'Document' or interface.id == 'DocumentFragment':
       return 'ElementEvents'
 
     parent_events_interface = 'Events'
     interfaces_with_events = set()
     for parent in self._database.Hierarchy(interface):
       if parent != interface and parent.id in self._event_classes:
         parent_events_interface = parent.id + 'Events'
         interfaces_with_events.add(parent)
     if len(interfaces_with_events) > 1:
       raise Exception('Only one parent event class allowed ' + interface.id)
     return parent_events_interface