Refactor file paths handling in generator.

lib/html/scripts/dartgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2012, 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 module generates Dart APIs from the IDL database."""
 
 import emitter
 import idlnode
 import logging
 import os
 import re
 import shutil
-import systembase
 from generator import *
 
 _logger = logging.getLogger('dartgenerator')
 
 def MergeNodes(node, other):
   node.operations.extend(other.operations)
   for attribute in other.attributes:
     if not node.has_attribute(attribute):
       node.attributes.append(attribute)
 
@@ skipping 157 matching lines @@
       if HasAnnotations(interface):
         interface.constants = filter(HasAnnotations, interface.constants)
         interface.attributes = filter(HasAnnotations, interface.attributes)
         interface.operations = filter(HasAnnotations, interface.operations)
         interface.parents = filter(HasAnnotations, interface.parents)
       else:
         database.DeleteInterface(interface.id)
 
     self.FilterMembersWithUnidentifiedTypes(database)
 
-  def Generate(self, database, system, super_database=None, webkit_renames={}):
+  def Generate(self, database, super_database, webkit_renames,

[vsm, 2012/09/25 16:06:14]

Should this be renamed to Process or similar?  It looks like it's no longer
generating code.

[podivilov1, 2012/09/25 16:40:28]

Reverted this change. I'll try to decouple dartgenerator from System in a
separate change.

+               process_interface, process_callback):

[Anton Muhin, 2012/09/25 16:15:50]

why pass callbacks, not some generator? 

[podivilov1, 2012/09/25 16:40:28]

Done.

     self._database = database
 
     # Collect interfaces
     interfaces = []
     for interface in database.GetInterfaces():
       if not MatchSourceFilter(interface):
         # Skip this interface since it's not present in the required source
         _logger.info('Omitting interface - %s' % interface.id)
         continue
       interfaces.append(interface)
@@ skipping 19 matching lines @@
       interface_name = interface.id
       auxiliary_file = self._auxiliary_files.get(interface_name)
       if auxiliary_file is not None:
         _logger.info('Skipping %s because %s exists' % (
             interface_name, auxiliary_file))
         continue
 
       if 'Callback' in interface.ext_attrs:
         handlers = [op for op in interface.operations if op.id == 'handleEvent']
         info = AnalyzeOperation(interface, handlers)
-        system.ProcessCallback(interface, info)
+        process_callback(interface, info)
       else:
         _logger.info('Generating %s' % interface.id)
-        system.ProcessInterface(interface)
-
-    system.GenerateLibraries()
-    system.Finish()
+        process_interface(interface)
 
   def _PreOrderInterfaces(self, interfaces):
     """Returns the interfaces in pre-order, i.e. parents first."""
     seen = set()
     ordered = []
     def visit(interface):
       if interface.id in seen:
         return
       seen.add(interface.id)
       for parent in interface.parents:
@@ skipping 31 matching lines @@
         ast = [('Annotation', [('Id', 'WebKit')]),
                ('InterfaceType', ('ScopedName', 'EventTarget'))]
         interface.parents.append(idlnode.IDLParentInterface(ast))
 
   def AddMissingArguments(self, database):
     ARG = idlnode.IDLArgument([('Type', ('ScopedName', 'Object')), ('Id', 'arg')])
     for interface in database.GetInterfaces():
       for operation in interface.operations:
         if operation.ext_attrs.get('CallWith') == 'ScriptArguments|CallStack':
           operation.arguments.append(ARG)