This CL contains all of the changes for splitting off all of the native

tools/dom/scripts/systemhtml.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 the system to generate
 Dart:html APIs from the IDL database."""
 
 import emitter
 import logging
@@ skipping 463 matching lines @@
     code = self._library_emitter.FileEmitter(self._interface.id,
         self._library_name)
     code.Emit(self._template_loader.Load('callback.darttemplate'))
 
     annotations = self._metadata.GetFormattedMetadata(self._library_name,
         self._interface)
 
     code.Emit('$(ANNOTATIONS)typedef void $NAME($PARAMS);\n',
               ANNOTATIONS=annotations,
               NAME=typedef_name,
-              PARAMS=info.ParametersDeclaration(self._DartType))
+              PARAMS=info.ParametersAsDeclaration(self._DartType))
     self._backend.GenerateCallback(info)
 
   def GenerateInterface(self):
     interface_name = self._interface_type_info.interface_name()
 
     factory_provider = None
     if interface_name in interface_factories:
       factory_provider = interface_factories[interface_name]
     factory_constructor_name = None
 
@@ skipping 63 matching lines @@
 
     class_modifiers = ''
     if (self._renamer.ShouldSuppressInterface(self._interface) or
         IsPureInterface(self._interface.id)):
       class_modifiers = 'abstract '
 
     native_spec = ''
     if not IsPureInterface(self._interface.id):
       native_spec = self._backend.NativeSpec()
 
-    self._implementation_members_emitter = implementation_emitter.Emit(
+    implementation_members_emitter = implementation_emitter.Emit(
         self._backend.ImplementationTemplate(),
         LIBRARYNAME='dart.dom.%s' % self._library_name,
         ANNOTATIONS=annotations,
         CLASS_MODIFIERS=class_modifiers,
         CLASSNAME=self._interface_type_info.implementation_name(),
         EXTENDS=' extends %s' % base_class if base_class else '',
         IMPLEMENTS=implements_str,
         MIXINS=mixins_str,
         DOMNAME=self._interface.doc_js_name,
         NATIVESPEC=native_spec)
     stream_getter_signatures_emitter = None
     element_stream_getters_emitter = None
-    if type(self._implementation_members_emitter) == tuple:
-      # We add event stream getters for both Element and ElementList, so in
-      # impl_Element.darttemplate, we have two additional "holes" for emitters
-      # to fill in, with small variations. These store these specialized
-      # emitters.
-      stream_getter_signatures_emitter = self._implementation_members_emitter[0]
-      element_stream_getters_emitter = self._implementation_members_emitter[1]
-      self._implementation_members_emitter = \
-          self._implementation_members_emitter[2]
-    self._backend.StartInterface(self._implementation_members_emitter)
-
+    toplevel_emitter = None
+    if type(implementation_members_emitter) == tuple:
+      if len(implementation_members_emitter) == 2:
+        # We have both a TOPLEVEL and MEMBERS field to fill in, but
+        # no additional stream fields.
+        toplevel_emitter = implementation_members_emitter[0]
+        implementation_members_emitter = \
+            implementation_members_emitter[1]
+      else:
+        # We add event stream getters for both Element and ElementList, so in
+        # impl_Element.darttemplate, we have two additional "holes" for emitters
+        # to fill in, with small variations. These store these specialized
+        # emitters.
+        # We have both a TOPLEVEL and MEMBERS field to fill in as above
+        assert len(implementation_members_emitter) == 4;
+        toplevel_emitter = implementation_members_emitter[0]
+        stream_getter_signatures_emitter = \
+            implementation_members_emitter[1]
+        element_stream_getters_emitter = implementation_members_emitter[2]
+        implementation_members_emitter = \
+            implementation_members_emitter[3]
+    self._backend.StartInterface(implementation_members_emitter,
+                                 toplevel_emitter)
     self._backend.EmitHelpers(base_class)
     self._event_generator.EmitStreamProviders(
         self._interface,
         self._backend.CustomJSMembers(),
-        self._implementation_members_emitter,
+        implementation_members_emitter,
         self._library_name)
     self._backend.AddConstructors(
         constructors, factory_provider, factory_constructor_name)
 
     isElement = False
     for parent in self._database.Hierarchy(self._interface):
       if parent.id == 'Element':
         isElement = True
     if isElement and self._interface.id != 'Element':
-      self._implementation_members_emitter.Emit(
+      implementation_members_emitter.Emit(
           '  /**\n'
           '   * Constructor instantiated by the DOM when a custom element has been created.\n'
           '   *\n'
           '   * This can only be called by subclasses from their created constructor.\n'
           '   */\n'
           '  $CLASSNAME.created() : super.created();\n',
           CLASSNAME=self._interface_type_info.implementation_name())
 
     self._backend.EmitSupportCheck()
 
     merged_interface = self._interface_type_info.merged_interface()
     if merged_interface:
       self._backend.AddMembers(self._database.GetInterface(merged_interface),
         not self._backend.ImplementsMergedMembers())
 
     self._backend.AddMembers(self._interface)
     self._backend.AddSecondaryMembers(self._interface)
     self._event_generator.EmitStreamGetters(
         self._interface,
         [],
-        self._implementation_members_emitter,
+        implementation_members_emitter,
         self._library_name, stream_getter_signatures_emitter,
         element_stream_getters_emitter)
     self._backend.FinishInterface()
 
   def _ImplementationEmitter(self):
     basename = self._interface_type_info.implementation_name()
     if (self._interface_type_info.merged_into() and
         self._backend.ImplementsMergedMembers()):
       # Merged members are implemented in target interface implementation.
       return emitter.Emitter()
@@ skipping 37 matching lines @@
   def NativeSpec(self):
     native_spec = MakeNativeSpec(self._interface.javascript_binding_name)
     return ' native "%s"' % native_spec
 
   def ImplementationTemplate(self):
     template_file = ('impl_%s.darttemplate' %
                      self._interface.doc_js_name)
     return (self._template_loader.TryLoad(template_file) or
             self._template_loader.Load('dart2js_impl.darttemplate'))
 
-  def StartInterface(self, members_emitter):
+  def StartInterface(self, members_emitter, toplevel_emitter):
+    # We currently emit no top level members for dart2js
     self._members_emitter = members_emitter
 
   def FinishInterface(self):
     pass
 
   def HasSupportCheck(self):
     return self._interface.doc_js_name in js_support_checks
 
   def GetSupportCheck(self):
     """Return a tuple of the support check function signature and the support
@@ skipping 278 matching lines @@
   def _AddDirectNativeOperation(self, info, html_name):
     self._members_emitter.Emit(
         '\n'
         '  $RENAME$METADATA$MODIFIERS$TYPE $NAME($PARAMS) native;\n',
         RENAME=self._RenamingAnnotation(info.declared_name, html_name),
         METADATA=self._Metadata(info.type_name, info.declared_name,
             self.SecureOutputType(info.type_name)),
         MODIFIERS='static ' if info.IsStatic() else '',
         TYPE=self.SecureOutputType(info.type_name, False, True),
         NAME=html_name,
-        PARAMS=info.ParametersDeclaration(self._NarrowInputType))
+        PARAMS=info.ParametersAsDeclaration(self._NarrowInputType))
 
   def _AddOperationWithConversions(self, info, html_name):
     # Assert all operations have same return type.
     assert len(set([op.type.id for op in info.operations])) == 1
     output_conversion = self._OutputConversion(info.type_name,
                                                info.declared_name)
     if output_conversion:
       return_type = output_conversion.output_type
       native_return_type = output_conversion.input_type
     else:
@@ skipping 69 matching lines @@
           MODIFIERS='static ' if info.IsStatic() else '',
           TYPE=TypeOrNothing(native_return_type),
           TARGET=target,
           PARAMS=', '.join(target_parameters))
 
     declaration = '%s%s%s %s(%s)' % (
         self._Metadata(info.type_name, info.declared_name, return_type),
         'static ' if info.IsStatic() else '',
         return_type,
         html_name,
-        info.ParametersDeclaration(InputType))
+        info.ParametersAsDeclaration(InputType))
     self._GenerateDispatcherBody(
         info,
         operations,
         declaration,
         GenerateCall,
         lambda _, argument: IsOptional(argument),
         can_omit_type_check=lambda type, pos: type == parameter_types[pos])
 
   def _AddInterfaceOperation(self, info, html_name):
     self._members_emitter.Emit(
         '\n'
         '  $TYPE $NAME($PARAMS);\n',
         TYPE=self.SecureOutputType(info.type_name, False, True),
         NAME=html_name,
-        PARAMS=info.ParametersDeclaration(self._NarrowInputType))
+        PARAMS=info.ParametersAsDeclaration(self._NarrowInputType))
 
 
   def _OperationRequiresConversions(self, operation):
     return (self._OperationRequiresOutputConversion(operation) or
             self._OperationRequiresInputConversions(operation))
 
   def _OperationRequiresOutputConversion(self, operation):
     return self._OutputConversion(operation.type.id, operation.id)
 
   def _OperationRequiresInputConversions(self, operation):
@@ skipping 142 matching lines @@
     for library_name in libraries:
       self._libraries[library_name] = DartLibrary(
           library_name, template_loader, library_type, output_dir)
 
   def AddFile(self, basename, library_name, path):
     self._libraries[library_name].AddFile(path)
 
   def Emit(self, emitter, auxiliary_dir):
     for lib in self._libraries.values():
       lib.Emit(emitter, auxiliary_dir)