[WIP][NotForLand] IDL dictionary support

Source/bindings/scripts/idl_compiler.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.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 from code_generator_v8 import CodeGeneratorV8
 from idl_reader import IdlReader
 from utilities import write_file
 
 
 def parse_options():
     parser = OptionParser()
     parser.add_option('--cache-directory',
                       help='cache directory, defaults to output directory')
     parser.add_option('--output-directory')
+    parser.add_option('--impl-output-directory')
     parser.add_option('--interfaces-info-file')
     parser.add_option('--write-file-only-if-changed', type='int')
     # ensure output comes last, so command line easy to parse via regexes
     parser.disable_interspersed_args()
 
     options, args = parser.parse_args()
     if options.output_directory is None:
         parser.error('Must specify output directory using --output-directory.')
     options.write_file_only_if_changed = bool(options.write_file_only_if_changed)
     if len(args) != 1:
@@ skipping 11 matching lines @@
 class IdlCompiler(object):
     """Abstract Base Class for IDL compilers.
 
     In concrete classes:
     * self.code_generator must be set, implementing generate_code()
       (returning a list of output code), and
     * compile_file() must be implemented (handling output filenames).
     """
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, output_directory, cache_directory='',
+    def __init__(self, output_directory, impl_output_directory=None,

[Nils Barth (inactive), 2014/07/18 21:52:34]

None => ''
(blank string better default)

+                 cache_directory='',
                  code_generator=None, interfaces_info=None,
                  interfaces_info_filename='', only_if_changed=False):
         """
         Args:
             interfaces_info:
                 interfaces_info dict
                 (avoids auxiliary file in run-bindings-tests)
             interfaces_info_file: filename of pickled interfaces_info
         """
         cache_directory = cache_directory or output_directory
         self.cache_directory = cache_directory
         self.code_generator = code_generator
         if interfaces_info_filename:
             with open(interfaces_info_filename) as interfaces_info_file:
                 interfaces_info = pickle.load(interfaces_info_file)
+        self.impl_output_directory = impl_output_directory
         self.interfaces_info = interfaces_info
         self.only_if_changed = only_if_changed
         self.output_directory = output_directory
         self.reader = IdlReader(interfaces_info, cache_directory)
 
-    def compile_and_write(self, idl_filename, output_filenames):
+    def compile_and_write(self, idl_filename):
         interface_name = idl_filename_to_interface_name(idl_filename)
         definitions = self.reader.read_idl_definitions(idl_filename)
-        output_code_list = self.code_generator.generate_code(
+        generation_results = self.code_generator.generate_code(
             definitions, interface_name)
-        for output_code, output_filename in zip(output_code_list,
-                                                output_filenames):
-            write_file(output_code, output_filename, self.only_if_changed)
+        for result in generation_results:
+            write_file(result.output_code, result.output_path,
+                       self.only_if_changed)
 
     @abc.abstractmethod
     def compile_file(self, idl_filename):
         pass
 
 
 class IdlCompilerV8(IdlCompiler):
     def __init__(self, *args, **kwargs):
         IdlCompiler.__init__(self, *args, **kwargs)
         self.code_generator = CodeGeneratorV8(self.interfaces_info,
-                                              self.cache_directory)
+                                              self.cache_directory,
+                                              self.output_directory,
+                                              self.impl_output_directory)
 
     def compile_file(self, idl_filename):
-        interface_name = idl_filename_to_interface_name(idl_filename)
-        header_filename = os.path.join(self.output_directory,
-                                       'V8%s.h' % interface_name)
-        cpp_filename = os.path.join(self.output_directory,
-                                    'V8%s.cpp' % interface_name)
-        self.compile_and_write(idl_filename, (header_filename, cpp_filename))
+        self.compile_and_write(idl_filename)
 
 
 def main():
     options, idl_filename = parse_options()
     idl_compiler = IdlCompilerV8(
         options.output_directory,
+        options.impl_output_directory,
         cache_directory=options.cache_directory,
         interfaces_info_filename=options.interfaces_info_file,
         only_if_changed=options.write_file_only_if_changed)
     idl_compiler.compile_file(idl_filename)
 
 
 if __name__ == '__main__':
     sys.exit(main())