Move IDL implements statements to IDL files that implement the interface

Source/bindings/scripts/preprocess_idls.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 54 matching lines @@
 
 def get_partial_interface_name_from_idl(file_contents):
     match = re.search(r'partial\s+interface\s+(\w+)', file_contents)
     if match:
         return match.group(1)
     return None
 
 
 # identifier-A implements identifier-B;
 # http://www.w3.org/TR/WebIDL/#idl-implements-statements
-def get_implementers_from_idl(file_contents, interface_name):
-    implementers = []
+def get_implemented_interfaces_from_idl(file_contents, interface_name):
+    implemented_interfaces = []
     for match in re.finditer(r'(\w+)\s+implements\s+(\w+)\s*;', file_contents):
-        # identifier-B must be the current interface
-        assert match.group(2) == interface_name
-        implementers.append(match.group(1))
-    return implementers
+        # identifier-A must be the current interface
+        assert match.group(1) == interface_name, \
+"Identifier on the left of the 'implements' statement should be %s in %s.idl, but found %s" % (interface_name, interface_name, match.group(1))
+        implemented_interfaces.append(match.group(2))
+    return implemented_interfaces
 
 def is_callback_interface_from_idl(file_contents):
     match = re.search(r'callback\s+interface\s+\w+', file_contents)
     return match is not None
 
 
 def get_interface_extended_attributes_from_idl(file_contents):
     extended_attributes = {}
     match = re.search(r'\[(.*)\]\s+(interface|exception)\s+(\w+)',
                       file_contents, flags=re.DOTALL)
@@ skipping 50 matching lines @@
 
 
 def parse_idl_files(idl_files, window_constructors_filename, workercontext_constructors_filename):
     interface_name_to_idl_file = {}
     idl_file_to_interface_name = {}
     supplemental_dependencies = {}
     supplementals = {}
     window_constructor_attributes_list = []
     workercontext_constructor_attributes_list = []
 
+    # Populate interface_name_to_idl_file first
+    for idl_file_name in idl_files:
+        full_path = os.path.realpath(idl_file_name)
+        interface_name, _ = os.path.splitext(os.path.basename(idl_file_name))
+        interface_name_to_idl_file[interface_name] = full_path
+
     for idl_file_name in idl_files:
         full_path = os.path.realpath(idl_file_name)
         idl_file_contents = get_file_contents(full_path)
         # Handle partial interfaces
         partial_interface_name = get_partial_interface_name_from_idl(idl_file_contents)
         if partial_interface_name:
             supplemental_dependencies[full_path] = [partial_interface_name]
             continue
         interface_name, _ = os.path.splitext(os.path.basename(idl_file_name))
         # Parse 'identifier-A implements identifier-B; statements
-        implementers = get_implementers_from_idl(idl_file_contents, interface_name)
-        for implementer in implementers:
-            supplemental_dependencies.setdefault(full_path, []).append(implementer)
+        implemented_interfaces = get_implemented_interfaces_from_idl(idl_file_contents, interface_name)
+        for implemented_interface in implemented_interfaces:
+            assert implemented_interface in interface_name_to_idl_file, \
+"Could not find a the IDL file where the following implemented interface is defined: %s" % implemented_interface
+            supplemental_dependencies.setdefault(interface_name_to_idl_file[implemented_interface], []).append(interface_name)
         # Handle [NoInterfaceObject]
         if not is_callback_interface_from_idl(idl_file_contents):
             extended_attributes = get_interface_extended_attributes_from_idl(idl_file_contents)
             if 'NoInterfaceObject' not in extended_attributes:
                 global_context = extended_attributes.get("GlobalContext", "WindowOnly")
                 constructor_list = generate_constructor_attribute_list(interface_name, extended_attributes)
                 if global_context != "WorkerOnly":
                     window_constructor_attributes_list.extend(constructor_list)
                 if global_context != "WindowOnly":
                     workercontext_constructor_attributes_list.extend(constructor_list)
-        interface_name_to_idl_file[interface_name] = full_path
         idl_file_to_interface_name[full_path] = interface_name
         supplementals[full_path] = []
 
     # Generate Global constructors
     generate_global_constructors_partial_interface("Window", window_constructors_filename, window_constructor_attributes_list)
     if 'Window' in interface_name_to_idl_file:
         supplemental_dependencies[window_constructors_filename] = ['Window']
     generate_global_constructors_partial_interface("WorkerContext", workercontext_constructors_filename, workercontext_constructor_attributes_list)
     if 'WorkerContext' in interface_name_to_idl_file:
         supplemental_dependencies[workercontext_constructors_filename] = ['WorkerContext']
@@ skipping 44 matching lines @@
     idl_files = []
     with open(options.idl_files_list) as idl_files_list_file:
         for line in idl_files_list_file:
             idl_files.append(string.rstrip(line, '\n'))
     resolved_supplementals = parse_idl_files(idl_files, options.window_constructors_file, options.workercontext_constructors_file)
     write_dependency_file(options.supplemental_dependency_file, resolved_supplementals, only_if_changed=options.write_file_only_if_changed)
 
 
 if __name__ == '__main__':
     main()