Split backend.AddMembers call into series of backend.AddAtribute/backend.AddOperation calls.

lib/dom/scripts/systemhtml.py

Index: lib/dom/scripts/systemhtml.py
diff --git a/lib/dom/scripts/systemhtml.py b/lib/dom/scripts/systemhtml.py
index d432c32d5b5b3ac0a0fb5bc49be66af91542568e..35373d1e41bacde09896d0fd7847591574daea5f 100644
--- a/lib/dom/scripts/systemhtml.py
+++ b/lib/dom/scripts/systemhtml.py
@@ -932,17 +932,22 @@ class HtmlDartInterfaceGenerator(BaseGenerator):
 
     self._GenerateEvents()
 
+    self._backend.StartGeneratingMergedMembers()

[Anton Muhin, 2012/07/04 16:42:39]

I think it's too hacky, esp. this mute all the emitters part.

As a suggestion, maybe you should change API to produce a merged members
generator?  html backend may return itself, dartium one will return something
which does nothing.  Just as an idea

[podivilov, 2012/07/04 17:44:05]

Done.

     for merged_interface in _merged_html_interfaces:
       if _merged_html_interfaces[merged_interface] == self._interface.id:
         merged_interface = self._database.GetInterface(merged_interface)
         self.AddMembers(merged_interface)
-        self._backend.AddMergedMembers(merged_interface)
+    self._backend.FinishGeneratingMergedMembers()
 
-    self._backend.AddMembers(self._interface)
-    self._backend.AddSecondaryMembers(self._interface)
-    self._backend.FinishInterface()
+  def AddIndexer(self, element_type):
+    self._backend.AddIndexer(element_type)
+
+  def AmendIndexer(self, element_type):
+    self._backend.AmendIndexer(element_type)
 
   def AddAttribute(self, attribute):
+    self._backend.AddAttribute(attribute)

[Anton Muhin, 2012/07/04 16:42:39]

nit: move to the end of the method, plz

[podivilov, 2012/07/04 17:44:05]

I don't want to mess with early returns in this method, at least for now. See
https://chromiumcodereview.appspot.com/10704102/.

+
     getter = attribute
     setter = attribute if not IsReadOnly(attribute) else None
     dom_name = DartDomNameOfAttribute(getter)
@@ -998,9 +1003,14 @@ class HtmlDartInterfaceGenerator(BaseGenerator):
                                  NAME=html_name,
                                  PARAMS=info.ParametersInterfaceDeclaration(
                                         self._shared.DartType))
+    self._backend.AddOperation(info)
+
+  def AddStaticOperation(self, info):
+    self._backend.AddStaticOperation(info)
 
   def FinishInterface(self):
-    pass
+    self._backend.AddSecondaryMembers(self._interface)
+    self._backend.FinishInterface()
 
   def AddConstant(self, constant):
     type = TypeOrNothing(DartType(constant.type.id), constant.type.id)
@@ -1008,6 +1018,7 @@ class HtmlDartInterfaceGenerator(BaseGenerator):
                                NAME=constant.id,
                                TYPE=type,
                                VALUE=constant.value)
+    self._backend.AddConstant(constant)
 
   def _GenerateEvents(self):
     emit_events, event_attrs = self._shared.GetEventAttributes(self._interface)
@@ -1107,8 +1118,11 @@ class HtmlFrogClassGenerator(FrogInterfaceGenerator):
   def SetImplementationEmitter(self, implementation_emitter):
     self._dart_code = implementation_emitter
 
-  def AddMergedMembers(self, merged_interface):
-    self.AddMembers(merged_interface)
+  def StartGeneratingMergedMembers(self):
+    pass
+
+  def FinishGeneratingMergedMembers(self):
+    pass
 
   def _ImplClassName(self, type_name):
     return self._shared._ImplClassName(type_name)