Get rid of System class.

lib/html/scripts/dartdomgenerator.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.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
 import fremontcutbuilder
 import logging.config
 import multiemitter
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 from generator import TypeRegistry
 from htmlrenamer import HtmlRenamer
 from systembase import GeneratorOptions
-from systemhtml import DartLibraryEmitter, HtmlInterfacesSystem,\
-                       Dart2JSBackend
+from systemhtml import DartLibraryEmitter, Dart2JSBackend,\
+                       HtmlDartInterfaceGenerator, HtmlSystemShared
 from systemnative import CPPLibraryEmitter, DartiumBackend
 from templateloader import TemplateLoader
 
 _logger = logging.getLogger('dartdomgenerator')
 
 _webkit_renames = {
     # W3C -> WebKit name conversion
     # TODO(vsm): Maybe Store these renames in the IDLs.
     'ApplicationCache': 'DOMApplicationCache',
     'BarProp': 'BarInfo',
@@ skipping 42 matching lines @@
   emitters = multiemitter.MultiEmitter()
   renamer = HtmlRenamer(webkit_database)
   type_registry = TypeRegistry(webkit_database, renamer)
 
   def RunGenerator(dart_library_template, dart_output_dir, dart_library_path,
                    template_loader, backend_factory):
     options = GeneratorOptions(
         template_loader, webkit_database, type_registry, renamer)
     dart_library_emitter = DartLibraryEmitter(
         emitters, dart_library_template, dart_output_dir)
-    html_system = HtmlInterfacesSystem(
-        options, dart_library_emitter, backend_factory)
+    shared_system = HtmlSystemShared(webkit_database)

[Anton Muhin, 2012/10/01 15:44:44]

ping: should it belong here?

[podivilov, 2012/10/02 15:55:18]

kind of :) see http://codereview.chromium.org/11020008/

[Anton Muhin, 2012/10/02 15:59:22]

I meant it doesn't close on RunGenerator and can probably lifted into outer
scope.

On 2012/10/02 15:55:18, podivilov wrote:

[podivilov, 2012/10/02 17:11:55]

HtmlEventGenerator depends on template_loader and can't be lifted.

[Anton Muhin, 2012/10/03 06:20:37]

Pavel, given that referenced CL is already submitted, may you rebase this one to
see how it looks now?

On 2012/10/02 17:11:55, podivilov wrote:

+
+    def generate_interface(interface):
+      backend = backend_factory(interface)
+      interface_generator = HtmlDartInterfaceGenerator(
+          shared_system, options, dart_library_emitter, interface, backend)
+      interface_generator.Generate()
+
     generator.Generate(
-        webkit_database, html_system, common_database, _webkit_renames)
+        webkit_database, common_database, _webkit_renames, generate_interface)
     dart_library_emitter.EmitLibrary(dart_library_path, auxiliary_dir)
 
   if dart2js_output_dir:
     template_paths = ['html/dart2js', 'html/impl', 'html/interface', '']
     template_loader = TemplateLoader(template_dir,
                                      template_paths,
                                      {'DARTIUM': False, 'DART2JS': True})
     backend_options = GeneratorOptions(
         template_loader, webkit_database, type_registry, renamer)
     backend_factory = lambda interface:\
@@ skipping 87 matching lines @@
     _logger.info('Copy html_dart2js to dart2js/')
     GenerateSingleFile(os.path.join(dart2js_output_dir, 'html_dart2js.dart'),
                        '../dart2js')
   if 'htmldartium' in systems:
     _logger.info('Copy html_dartium to dartium/')
     GenerateSingleFile(os.path.join(dartium_output_dir, 'html_dartium.dart'),
                        '../dartium')
 
 if __name__ == '__main__':
   sys.exit(main())