Add missing includes (spotted while splitting cpp derived sources).

client/dom/scripts/systemnative.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 provides shared functionality for the systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 41 matching lines @@
         self._emitters.FileEmitter(cpp_impl_path),
         self._BaseDefines(interface),
         self._templates)
 
   def ProcessCallback(self, interface, info):
     self._interface = interface
 
     dart_interface_path = self._FilePathForDartInterface(self._interface.id)
     self._dom_public_files.append(dart_interface_path)
 
+    cpp_impl_includes = {}
     cpp_header_handlers_emitter = emitter.Emitter()
     cpp_impl_handlers_emitter = emitter.Emitter()
     class_name = 'Dart%s' % self._interface.id
     for operation in interface.operations:
       if operation.type.id == 'void':
         return_type = 'void'
         return_prefix = ''
       else:
         return_type = 'bool'
         return_prefix = 'return '
 
       parameters = []
       arguments = []
       for argument in operation.arguments:
         argument_type_info = GetIDLTypeInfo(argument.type)
         parameters.append('%s %s' % (argument_type_info.parameter_type(),
                                      argument.id))
         arguments.append(argument.id)
+        if argument_type_info.conversion_include():
+          cpp_impl_includes[argument_type_info.conversion_include()] = 1

[antonm, 2012/03/01 14:25:31]

why it's map?  should we assign 1 or None?

[podivilov, 2012/03/01 15:36:56]

Done.

 
       cpp_header_handlers_emitter.Emit(
           '\n'
           '    virtual $TYPE handleEvent($PARAMETERS);\n',
           TYPE=return_type, PARAMETERS=', '.join(parameters))
 
       cpp_impl_handlers_emitter.Emit(
           '\n'
           '$TYPE $CLASS_NAME::handleEvent($PARAMETERS)\n'
           '{\n'
@@ skipping 10 matching lines @@
     cpp_header_emitter.Emit(
         self._templates.Load('cpp_callback_header.template'),
         INTERFACE=self._interface.id,
         HANDLERS=cpp_header_handlers_emitter.Fragments())
 
     cpp_impl_path = self._FilePathForCppImplementation(self._interface.id)
     self._cpp_impl_files.append(cpp_impl_path)
     cpp_impl_emitter = self._emitters.FileEmitter(cpp_impl_path)
     cpp_impl_emitter.Emit(
         self._templates.Load('cpp_callback_implementation.template'),
+        INCLUDES=_GenerateCPPIncludes(cpp_impl_includes.keys()),
         INTERFACE=self._interface.id,
         HANDLERS=cpp_impl_handlers_emitter.Fragments())
 
   def GenerateLibraries(self, lib_dir):
     auxiliary_dir = os.path.relpath(self._auxiliary_dir, self._output_dir)
 
     # Generate dom_public.dart.
     self._GenerateLibFile(
         'dom_public.darttemplate',
         os.path.join(self._output_dir, 'dom_public.dart'),
@@ skipping 33 matching lines @@
           '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
           '        return func;\n',
           CLASS_NAME=os.path.splitext(os.path.basename(path))[0])
 
     cpp_resolver_emitter = self._emitters.FileEmitter(cpp_resolver_path)
     cpp_resolver_emitter.Emit(
         self._templates.Load('cpp_resolver.template'),
         INCLUDES=includes_emitter.Fragments(),
         RESOLVER_BODY=resolver_body_emitter.Fragments())
 
-    # Generate DartDerivedSourcesAll.cpp
-    cpp_all_in_one_path = os.path.join(self._output_dir,
-        'DartDerivedSourcesAll.cpp')
+    # Generate DartDerivedSourcesXX.cpp.
+    partitions = 20 # FIXME: this should be configurable.
+    sources_count = len(self._cpp_impl_files)
+    for i in range(0, partitions):
+      cpp_all_in_one_path = os.path.join(self._output_dir,

[antonm, 2012/03/01 14:25:31]

cpp_all_in_one is now misleading

+          'DartDerivedSources%02i.cpp' % (i + 1))
 
-    includes_emitter = emitter.Emitter()
-    for file in self._cpp_impl_files:
-        path = os.path.relpath(file, os.path.dirname(cpp_all_in_one_path))
-        includes_emitter.Emit('#include "$PATH"\n', PATH=path)
+      includes_emitter = emitter.Emitter()
+      for j in range(i * sources_count / partitions, (i + 1) * sources_count / partitions):

[antonm, 2012/03/01 14:25:31]

for impl_file in self._cpp_impl_files[i * sources_count / partitions : (i + 1) *
sources_count / partitions]:  ?

or, as you probably do not care about exact set of included sources:

for impl_file in self._cpp_impl_files[i::partitiions]"

[podivilov, 2012/03/01 15:36:56]

nice!

+          path = os.path.relpath(self._cpp_impl_files[j], os.path.dirname(cpp_all_in_one_path))
+          includes_emitter.Emit('#include "$PATH"\n', PATH=path)
 
-    cpp_all_in_one_emitter = self._emitters.FileEmitter(cpp_all_in_one_path)
-    cpp_all_in_one_emitter.Emit(
-        self._templates.Load('cpp_all_in_one.template'),
-        INCLUDES=includes_emitter.Fragments())
+      cpp_all_in_one_emitter = self._emitters.FileEmitter(cpp_all_in_one_path)
+      cpp_all_in_one_emitter.Emit(
+          self._templates.Load('cpp_all_in_one.template'),
+          INCLUDES=includes_emitter.Fragments())
 
-    # Generate DartResolver.cpp
+    # Generate DartResolver.cpp.
     cpp_resolver_path = os.path.join(self._output_dir, 'DartResolver.cpp')
 
     includes_emitter = emitter.Emitter()
     resolver_body_emitter = emitter.Emitter()
     for file in self._cpp_header_files:
         path = os.path.relpath(file, os.path.dirname(cpp_resolver_path))
         includes_emitter.Emit('#include "$PATH"\n', PATH=path)
         resolver_body_emitter.Emit(
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
@@ skipping 93 matching lines @@
     create_function = 'create'
     if 'NamedConstructor' in self._interface.ext_attrs:
       raises_dart_exceptions = True
       parameter_definitions_emitter.Emit(
             '        DOMWindow* domWindow = DartUtilities::domWindowForCurrentIsolate();\n'
             '        if (!domWindow) {\n'
             '            exception = Dart_NewString("Failed to fetch domWindow");\n'
             '            goto fail;\n'
             '        }\n'
             '        Document* document = domWindow->document();\n')
+      self._cpp_impl_includes['DOMWindow'] = 1
       arguments.append('document')
       create_function = 'createForJSConstructor'
     if 'CallWith' in self._interface.ext_attrs:
       call_with = self._interface.ext_attrs['CallWith']
       if call_with == 'ScriptExecutionContext':
         raises_dart_exceptions = True
         parameter_definitions_emitter.Emit(
             '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
             '        if (!context) {\n'
             '            exception = Dart_NewString("Failed to create an object");\n'
@@ skipping 28 matching lines @@
     self._dart_impl_emitter.Emit(
         self._templates.Load('dart_implementation.darttemplate'),
         CLASS=self._class_name, BASE=base, INTERFACE=self._interface.id,
         MEMBERS=self._members_emitter.Fragments())
 
     self._GenerateCppHeader()
 
     self._cpp_impl_emitter.Emit(
         self._templates.Load('cpp_implementation.template'),
         INTERFACE=self._interface.id,
-        INCLUDES=''.join(['#include "%s.h"\n' %
-          k for k in self._cpp_impl_includes.keys()]),
+        INCLUDES=_GenerateCPPIncludes(self._cpp_impl_includes.keys()),
         CALLBACKS=self._cpp_definitions_emitter.Fragments(),
         RESOLVER=self._cpp_resolver_emitter.Fragments())
 
   def _GenerateCppHeader(self):
-    webcore_include = self._interface_type_info.webcore_include()
-    if webcore_include:
-      webcore_include = '#include "%s.h"\n' % webcore_include
-    else:
-      webcore_include = ''
+    webcore_includes = _GenerateCPPIncludes(self._interface_type_info.webcore_includes())
 
     if ('CustomToJS' in self._interface.ext_attrs or
         'CustomToJSObject' in self._interface.ext_attrs or
         'PureInterface' in self._interface.ext_attrs or
         'CPPPureInterface' in self._interface.ext_attrs or
         self._interface_type_info.custom_to_dart()):
       to_dart_value_template = (
           'Dart_Handle toDartValue($(WEBCORE_CLASS_NAME)* value);\n')
     else:
       to_dart_value_template = (
           'inline Dart_Handle toDartValue($(WEBCORE_CLASS_NAME)* value)\n'
           '{\n'
           '    return DartDOMWrapper::toDart<Dart$(INTERFACE)>(value);\n'
           '}\n')
     to_dart_value_emitter = emitter.Emitter()
     to_dart_value_emitter.Emit(
         to_dart_value_template,
         INTERFACE=self._interface.id,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type())
 
     self._cpp_header_emitter.Emit(
         self._templates.Load('cpp_header.template'),
         INTERFACE=self._interface.id,
-        WEBCORE_INCLUDE=webcore_include,
-        ADDITIONAL_INCLUDES='',
+        WEBCORE_INCLUDES=webcore_includes,
         WEBCORE_CLASS_NAME=self._interface_type_info.native_type(),
         TO_DART_VALUE=to_dart_value_emitter.Fragments(),
         DECLARATIONS=self._cpp_declarations_emitter.Fragments())
 
   def AddAttribute(self, getter, setter):
     # FIXME: Dartium does not support attribute event listeners. However, JS
     # implementation falls back to them when addEventListener is not available.
     # Make sure addEventListener is available in all EventTargets and remove
     # this check.
     if (getter or setter).type.id == 'EventListener':
@@ skipping 398 matching lines @@
           '            goto fail;\n'
           '        }\n',
           INVOCATION=invocation_template)
 
     if 'ImplementedBy' in attributes:
       arguments.insert(0, 'receiver')
       self._cpp_impl_includes[attributes['ImplementedBy']] = 1
 
     return emitter.Format(invocation_template,
         FUNCTION_CALL='%s(%s)' % (function_expression, ', '.join(arguments)))
+
+def _GenerateCPPIncludes(includes):
+  return ''.join(['#include "%s.h"\n' % i for i in includes])

[antonm, 2012/03/01 14:25:31]

nit: i is usually for index :)

[podivilov, 2012/03/01 15:36:56]

Done.