Make per-interface generators an implementation detail of a system.

lib/dom/scripts/systembase.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 base functionality for systems to generate
 Dart APIs from the IDL database."""
 
 import os
 from generator import *
@@ skipping 13 matching lines @@
   - Finish
   """
 
   def __init__(self, templates, database, emitters, output_dir):
     self._templates = templates
     self._database = database
     self._emitters = emitters
     self._output_dir = output_dir
     self._dart_callback_file_paths = []
 
-  def InterfaceGenerator(self,
-                         interface,
-                         common_prefix,
-                         super_interface_name,
-                         source_filter):
-    """Returns an interface generator for |interface|.
-
-    Called once for each interface that is not a callback function.
-    """
-    return None
+  def ProcessInterface(self, interface):
+    """Processes an interface that is not a callback function."""
+    pass
 
   def ProcessCallback(self, interface, info):
     """Processes an interface that is a callback function."""
     pass
 
   def GenerateLibraries(self, lib_dir):
     pass
 
   def Finish(self):
     pass
@@ skipping 49 matching lines @@
             result.add(attr.id)
           for op in parent_interface.operations:
             result.add(op.id)
           WalkParentChain(parent_interface)
 
     result = set()
     WalkParentChain(interface)
     return result;
 
 class BaseGenerator(object):
-  def __init__(self, database):
+  def __init__(self, database, interface):
     self._database = database
+    self._interface = interface
+
+  def Generate(self):
+    self.StartInterface()
+    self.AddMembers(self._interface)
+    self.AddSecondaryMembers(self._interface)
+    self.FinishInterface()
 
   def AddMembers(self, interface):
     for const in sorted(interface.constants, ConstantOutputOrder):
       self.AddConstant(const)
 
     attributes = [attr for attr in interface.attributes
                   if attr.type.id != 'EventListener']
     for (getter, setter) in  _PairUpAttributes(attributes):
       self.AddAttribute(getter, setter)
 
@@ skipping 15 matching lines @@
 
     # Generate operations
     for id in sorted(operationsById.keys()):
       operations = operationsById[id]
       info = AnalyzeOperation(interface, operations)
       if info.IsStatic():
         self.AddStaticOperation(info)
       else:
         self.AddOperation(info)
 
-  def AddSecondaryMembers(self, interface, secondary_parents):
+  def AddSecondaryMembers(self, interface):
     # With multiple inheritance, attributes and operations of non-first
     # interfaces need to be added.  Sometimes the attribute or operation is
     # defined in the current interface as well as a parent.  In that case we
     # avoid making a duplicate definition and pray that the signatures match.
-
+    secondary_parents = self._TransitiveSecondaryParents(interface)
     for parent_interface in secondary_parents:
       if isinstance(parent_interface, str):  # IsDartCollectionType(parent_interface)
         continue
       attributes = [attr for attr in parent_interface.attributes
                     if not FindMatchingAttribute(interface, attr)]
       for (getter, setter) in _PairUpAttributes(attributes):
         self.AddSecondaryAttribute(parent_interface, getter, setter)
 
       # Group overloaded operations by id
       operationsById = {}
@@ skipping 26 matching lines @@
 
   def AddStaticOperation(self, info):
     pass
 
   def AddSecondaryAttribute(self, interface, getter, setter):
     pass
 
   def AddSecondaryOperation(self, interface, attr):
     pass
 
+  def _TransitiveSecondaryParents(self, interface):
+    """Returns a list of all non-primary parents.
+
+    The list contains the interface objects for interfaces defined in the
+    database, and the name for undefined interfaces.
+    """
+    def walk(parents):
+      for parent in parents:
+        if IsDartCollectionType(parent.type.id):
+          result.append(parent.type.id)
+          continue
+        if self._database.HasInterface(parent.type.id):
+          parent_interface = self._database.GetInterface(parent.type.id)
+          result.append(parent_interface)
+          walk(parent_interface.parents)
+
+    result = []
+    if interface.parents:
+      parent = interface.parents[0]
+      if IsPureInterface(parent.type.id):
+        walk(interface.parents)
+      else:
+        walk(interface.parents[1:])
+    return result;
+
 
 def _PairUpAttributes(attributes):
   """Returns a list of (getter, setter) pairs sorted by name.
 
   One element of the pair may be None.
   """
   names = sorted(set(attr.id for attr in attributes))
   getters = {}
   setters = {}
   for attr in attributes:
     if attr.is_fc_getter:
       getters[attr.id] = attr
     elif attr.is_fc_setter and 'Replaceable' not in attr.ext_attrs:
       setters[attr.id] = attr
   return [(getters.get(id), setters.get(id)) for id in names]