Add ImplementedBy attribute for operations merged from [Supplemental=XXX] interfaces.

client/dom/scripts/databasebuilder.py

 #!/usr/bin/python
 # Copyright (c) 2011, 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.
 
 import copy
 import database
 import idlparser
 import logging
 import os
@@ skipping 429 matching lines @@
       if not interface.is_supplemental:
         if self._database.HasInterface(interface.id):
           old_interface = self._database.GetInterface(interface.id)
           self._merge_interfaces(old_interface, interface, import_options)
         else:
           if import_options.add_new_interfaces:
             self._database.AddInterface(interface)
 
     # Step 3: Merge in supplemental interfaces
     for interface, module_name, import_options in self._imported_interfaces:
-      if interface.is_supplemental:
-        target_name = interface.ext_attrs['Supplemental']
-        if target_name:
-          # [Supplemental=DOMWindow] - merge into DOMWindow.
-          target = target_name
-        else:
-          # [Supplemental] - merge into existing inteface with same name.
-          target = interface.id
-        if self._database.HasInterface(target):
-          old_interface = self._database.GetInterface(target)
-          self._merge_interfaces(old_interface, interface, import_options)
-        else:
-          raise Exception("Supplemental target '%s' not found", target)
+      if not interface.is_supplemental:
+        continue
+
+      target_name = interface.ext_attrs['Supplemental'] or interface.id
+      if not self._database.HasInterface(target_name):
+        raise Exception("Supplemental target '%s' not found", target_name)
+      target_interface = self._database.GetInterface(target_name)
+      self._merge_interfaces(target_interface, interface, import_options)
+
+      if target_name == interface.id:
+        # [Supplemental] - merged into existing inteface with same name.
+        continue
+
+      # [Supplemental=DOMWindow] - merged into DOMWindow. Mark operations and
+      # attributes as [ImplementedBy=Interface]
+      attributes = set([attribute.id for attribute in interface.attributes])
+      for attribute in target_interface.attributes:
+        if attribute.id in attributes:
+          attribute.ext_attrs['ImplementedBy'] = interface.id
+      operations = set([operation.id for operation in interface.operations])
+      for operation in target_interface.operations:
+        if operation.id in operations:

[sra1, 2012/02/06 18:14:36]

Is it possible that foo(int) is implemented by I1 and foo(String, double) is
implemented by I2?
Maybe this code needs to be inside _merge_interfaces.

+          operation.ext_attrs['ImplementedBy'] = interface.id
 
     # Step 4: Resolve 'implements' statements
     for impl_stmt, import_options in self._impl_stmts:
       self._merge_impl_stmt(impl_stmt, import_options)
 
     self._impl_stmts = []
     self._imported_interfaces = []
 
   def import_idl_file(self, file_path,
             import_options=DatabaseBuilderOptions()):
@@ skipping 122 matching lines @@
             annotation = idl_node.annotations[source]
             for name, value in annotation.items():
               if (name in top_level_annotation
                   and value == top_level_annotation[name]):
                 del annotation[name]
 
         map(normalize, interface.parents)
         map(normalize, interface.constants)
         map(normalize, interface.attributes)
         map(normalize, interface.operations)