Some more refactorings of overload dispatcher generation.

tools/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 433 matching lines @@
       argument_count = (0 if info.IsStatic() else 1) + len(info.param_infos)
       cpp_callback_name = self._GenerateNativeBinding(
           info.name, argument_count, dart_declaration, 'Callback', is_custom)
       if not is_custom:
         self._GenerateOperationNativeCallback(operation, operation.arguments, cpp_callback_name)
     else:
       self._GenerateDispatcher(info.operations, dart_declaration, [info.name for info in info.param_infos])
 
   def _GenerateDispatcher(self, operations, dart_declaration, parameter_names):
 
-    body = self._members_emitter.Emit(
-        '\n'
-        '  $DECLARATION {\n'
-        '$!BODY'
-        '  }\n',
-        DECLARATION=dart_declaration)
-
-    version = [1]
-    def GenerateCall(operation, argument_count, checks):
-      if checks:
-        if operation.type.id != 'void':
-          template = '    if ($CHECKS) {\n      return $CALL;\n    }\n'
-        else:
-          template = '    if ($CHECKS) {\n      $CALL;\n      return;\n    }\n'
-      else:
-        if operation.type.id != 'void':
-          template = '    return $CALL;\n'
-        else:
-          template = '    $CALL;\n'
-
-      overload_name = '_%s_%s' % (operation.id, version[0])
-      version[0] += 1
+    def GenerateCall(
+        stmts_emitter, call_emitter, version, operation, argument_count):
+      overload_name = '_%s_%s' % (operation.id, version)
       argument_list = ', '.join(parameter_names[:argument_count])
-      call = '%s(%s)' % (overload_name, argument_list)
-      body.Emit(template, CHECKS=' && '.join(checks), CALL=call)
+      call_emitter.Emit('$NAME($ARGS)', NAME=overload_name, ARGS=argument_list)
 
       dart_declaration = '%s%s %s(%s)' % (
           'static ' if operation.is_static else '',
           self.SecureOutputType(operation.type.id),
           overload_name, argument_list)
       cpp_callback_name = self._GenerateNativeBinding(
           overload_name, (0 if operation.is_static else 1) + argument_count,
           dart_declaration, 'Callback', False)
       self._GenerateOperationNativeCallback(operation, operation.arguments[:argument_count], cpp_callback_name)
 
     self._GenerateDispatcherBody(
-        body,
         operations,
         parameter_names,
+        dart_declaration,
         GenerateCall,
         self._IsArgumentOptionalInWebCore)
 
   def SecondaryContext(self, interface):
     pass
 
   def _GenerateOperationNativeCallback(self, operation, arguments, cpp_callback_name):
     webcore_function_name = operation.ext_attrs.get('ImplementedAs', operation.id)
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, operation)
     self._GenerateNativeCallback(
@@ skipping 365 matching lines @@
         LIBRARY_NAME=library_name)
 
       headers = self._library_headers[library_name]
       for header_file in headers:
         path = os.path.relpath(header_file, output_dir)
         includes_emitter.Emit('#include "$PATH"\n', PATH=path)
         body_emitter.Emit(
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])