IDL: Avoid global variables in compute_interfaces_info_individual.py

Tools/Scripts/webkitpy/bindings/main.py

 # Copyright (C) 2011 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:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
@@ skipping 23 matching lines @@
 from webkitpy.common.system.executive import Executive
 
 # Source/ path is needed both to find input IDL files, and to import other
 # Python modules.
 module_path = os.path.dirname(__file__)
 source_path = os.path.normpath(os.path.join(module_path, os.pardir, os.pardir,
                                             os.pardir, os.pardir, 'Source'))
 sys.path.append(source_path)  # for Source/bindings imports
 
 import bindings.scripts.compute_interfaces_info_individual
-from bindings.scripts.compute_interfaces_info_individual import compute_info_individual, info_individual
+from bindings.scripts.compute_interfaces_info_individual import InterfaceInfoGeneratorIndividual
 import bindings.scripts.compute_interfaces_info_overall
 from bindings.scripts.compute_interfaces_info_overall import compute_interfaces_info_overall, interfaces_info
 from bindings.scripts.idl_compiler import IdlCompilerDictionaryImpl, IdlCompilerV8
 from bindings.scripts.idl_reader import IdlReader
 from bindings.scripts.utilities import idl_filename_to_component
 
 
 PASS_MESSAGE = 'All tests PASS!'
 FAIL_MESSAGE = """Some tests FAIL!
 To update the reference files, execute:
@@ skipping 50 matching lines @@
         # excess stat() calls. Faster versions may appear in Python 3.5 or
         # later:
         # https://github.com/benhoyt/scandir
         # http://bugs.python.org/issue11406
         idl_paths = []
         for dirpath, _, files in os.walk(directory):
             idl_paths.extend(os.path.join(dirpath, filename)
                              for filename in fnmatch.filter(files, '*.idl'))
         return idl_paths
 
+    def collect_blink_idl_paths():
+        """Returns IDL file paths which blink actually uses."""
+        idl_paths = []
+        for component in COMPONENT_DIRECTORY:
+            directory = os.path.join(source_path, component)
+            idl_paths.extend(idl_paths_recursive(directory))
+        return idl_paths
+
     # We compute interfaces info for *all* IDL files, not just test IDL
     # files, as code generator output depends on inheritance (both ancestor
     # chain and inherited extended attributes), and some real interfaces
     # are special-cased, such as Node.
     #
     # For example, when testing the behavior of interfaces that inherit
     # from Node, we also need to know that these inherit from EventTarget,
     # since this is also special-cased and Node inherits from EventTarget,
     # but this inheritance information requires computing dependencies for
     # the real Node.idl file.
-    non_test_idl_paths = []
-    test_idl_paths = []
-    test_idl_dir = test_input_directory + os.sep
-    for idl_path in idl_paths_recursive(source_path):
-        if idl_path.startswith(test_idl_dir):
-            test_idl_paths.append(idl_path)
-        else:
-            non_test_idl_paths.append(idl_path)
+    non_test_idl_paths = collect_blink_idl_paths()
+    test_idl_paths = idl_paths_recursive(test_input_directory)
     # 2-stage computation: individual, then overall
     #
     # Properly should compute separately by component (currently test
     # includes are invalid), but that's brittle (would need to update this file
     # for each new component) and doesn't test the code generator any better
     # than using a single component.
     #
     # In order to allow test IDL files to override the production IDL files if
     # they have the same interface name, process the test IDL files after the
     # non-test IDL files.
-    reader = IdlReader(outputdir=output_directory)
+    info_individuals = []
+    info_generator_individual = InterfaceInfoGeneratorIndividual(
+        cache_directory=output_directory)
     for idl_path_list in (non_test_idl_paths, test_idl_paths):
         for idl_path in idl_path_list:
             if os.path.basename(idl_path) in NON_BLINK_IDL_FILES:
                 continue
-            compute_info_individual(idl_path, reader)
-    info_individuals = [info_individual()]
+            info_generator_individual.compute_info(idl_path)
+        info_individuals.append(info_generator_individual.get_info_as_dict())

[bashi, 2014/10/22 09:43:30]

No actual change here in this CL, but I'm planning to add logic something like:
- collect union types for IDL files under Source/bindings/tests/idls
- don't collect union types for IDL files under Source/core and Source/bindings

We will create container classes for all collected union types, so if we collect
union types for core/modules IDL files, the expectation of run-bindings-tests
could be affected by them. I don't think it's desirable.

     # TestDictionary.{h,cpp} are placed under Source/bindings/tests/idls/core.
     # However, IdlCompiler generates TestDictionary.{h,cpp} by using relative_dir.
     # So the files will be generated under output_dir/core/bindings/tests/idls/core.
     # To avoid this issue, we need to clear relative_dir here.
     for info in info_individuals:
         for value in info['interfaces_info'].itervalues():
             value['relative_dir'] = ''
     compute_interfaces_info_overall(info_individuals)
 
 
@@ skipping 151 matching lines @@
 
 
 def run_bindings_tests(reset_results, verbose):
     # Generate output into the reference directory if resetting results, or
     # a temp directory if not.
     if reset_results:
         print 'Resetting results'
         return bindings_tests(reference_directory, verbose)
     with TemporaryDirectory() as temp_dir:
         return bindings_tests(temp_dir, verbose)