bindings: Allow multiple enum declarations

third_party/WebKit/Source/bindings/scripts/compute_interfaces_info_individual.py

 #!/usr/bin/python
 #
 # 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.
@@ skipping 154 matching lines @@
 
 class InterfaceInfoCollector(object):
     """A class that collects interface information from idl files."""
     def __init__(self, cache_directory=None):
         self.reader = IdlReader(interfaces_info=None, outputdir=cache_directory)
         self.interfaces_info = {}
         self.partial_interface_files = defaultdict(lambda: {
             'full_paths': [],
             'include_paths': [],
         })
-        self.enumerations = set()
+        self.enumerations = {}
         self.union_types = set()
         self.typedefs = {}
         self.callback_functions = {}
 
     def add_paths_to_partials_dict(self, partial_interface_name, full_path,
                                    include_paths):
         paths_dict = self.partial_interface_files[partial_interface_name]
         paths_dict['full_paths'].append(full_path)
         paths_dict['include_paths'].extend(include_paths)
 
+    def check_enum_consistency(self, enum):
+        existing_enum = self.enumerations.get(enum.name)
+        if not existing_enum:
+            return True
+        # TODO(bashi): Ideally we should not allow multiple enum declarations
+        # but we allow them to work around core/module separation.
+        if len(existing_enum.values) != len(enum.values):
+            return False
+        return all(value in existing_enum.values for value in enum.values)
+
     def collect_info(self, idl_filename):
         """Reads an idl file and collects information which is required by the
         binding code generation."""
         def collect_unforgeable_attributes(definition, idl_filename):
             """Collects [Unforgeable] attributes so that we can define them on
             sub-interfaces later.  The resulting structure is as follows.
                 interfaces_info[interface_name] = {
                     'unforgeable_attributes': [IdlAttribute, ...],
                     ...
                 }
@@ skipping 19 matching lines @@
         self.union_types.update(this_union_types)
         self.typedefs.update(definitions.typedefs)
         for callback_function_name, callback_function in definitions.callback_functions.iteritems():
             # Set 'component_dir' to specify a directory that callback function files belong to
             self.callback_functions[callback_function_name] = {
                 'callback_function': callback_function,
                 'component_dir': idl_filename_to_component(idl_filename),
                 'full_path': os.path.realpath(idl_filename),
             }
         # Check enum duplication.
-        for enum_name in definitions.enumerations.keys():
-            for defined_enum in self.enumerations:
-                if defined_enum.name == enum_name:
-                    raise Exception('Enumeration %s has multiple definitions' % enum_name)
-        self.enumerations.update(definitions.enumerations.values())
+        for enum in definitions.enumerations.values():
+            if not self.check_enum_consistency(enum):
+                raise Exception('Enumeration "%s" is defined more than once '
+                                'with different valid values' % enum.name)
+        self.enumerations.update(definitions.enumerations)
 
         if definitions.interfaces:
             definition = next(definitions.interfaces.itervalues())
             interface_info = {
                 'is_callback_interface': definition.is_callback,
                 'is_dictionary': False,
                 # Interfaces that are referenced (used as types) and that we
                 # introspect during code generation (beyond interface-level
                 # data ([ImplementedAs], is_callback_interface, ancestors, and
                 # inherited extended attributes): deep dependencies.
@@ skipping 77 matching lines @@
             # Can't pickle defaultdict, convert to dict
             # FIXME: this should be included in get_component_info.
             'partial_interface_files': dict(self.partial_interface_files),
         }
 
     def get_component_info_as_dict(self):
         """Returns component wide information as a dict."""
         return {
             'callback_functions': self.callback_functions,
             'enumerations': dict((enum.name, enum.values)
-                                 for enum in self.enumerations),
+                                 for enum in self.enumerations.values()),
             'typedefs': self.typedefs,
             'union_types': self.union_types,
         }
 
 
 ################################################################################
 
 def main():
     options, _ = parse_options()
 
     # IDL files are passed in a file, due to OS command line length limits
     idl_files = read_idl_files_list_from_file(options.idl_files_list, is_gyp_format=False)
 
     # Compute information for individual files
     # Information is stored in global variables interfaces_info and
     # partial_interface_files.
     info_collector = InterfaceInfoCollector(options.cache_directory)
     for idl_filename in idl_files:
         info_collector.collect_info(idl_filename)
 
     write_pickle_file(options.interfaces_info_file,
                       info_collector.get_info_as_dict())
     write_pickle_file(options.component_info_file,
                       info_collector.get_component_info_as_dict())
 
 if __name__ == '__main__':
     sys.exit(main())