Correct handling of return types for callbacks.

lib/html/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 16 matching lines @@
     self._interface = interface
 
     if IsPureInterface(self._interface.id):
       return None
 
     cpp_impl_includes = set()
     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_prefix = ''
-        error_return = ''
-      else:
-        return_prefix = 'return '
-        error_return = ' false'
-
       parameters = []
       arguments = []
       conversion_includes = []
       for argument in operation.arguments:
         argument_type_info = self._type_registry.TypeInfo(argument.type.id)
         parameters.append('%s %s' % (argument_type_info.parameter_type(),
                                      argument.id))
         arguments.append(argument_type_info.to_dart_conversion(argument.id))
         conversion_includes.extend(argument_type_info.conversion_includes())
 
-      native_return_type = self._type_registry.TypeInfo(operation.type.id).native_type()
       cpp_header_handlers_emitter.Emit(
           '\n'
-          '    virtual $TYPE handleEvent($PARAMETERS);\n',
-          TYPE=native_return_type, PARAMETERS=', '.join(parameters))
+          '    virtual bool handleEvent($PARAMETERS);\n',
+          PARAMETERS=', '.join(parameters))
 
       if 'Custom' in operation.ext_attrs:
         continue
 
       cpp_impl_includes |= set(conversion_includes)
       arguments_declaration = 'Dart_Handle arguments[] = { %s }' % ', '.join(arguments)
       if not len(arguments):
         arguments_declaration = 'Dart_Handle* arguments = 0'
       cpp_impl_handlers_emitter.Emit(
           '\n'
-          '$TYPE $CLASS_NAME::handleEvent($PARAMETERS)\n'
+          'bool $CLASS_NAME::handleEvent($PARAMETERS)\n'
           '{\n'
           '    if (!m_callback.isolate()->isAlive())\n'
-          '        return$ERROR_RETURN;\n'
+          '        return false;\n'
           '    DartIsolate::Scope scope(m_callback.isolate());\n'
           '    DartApiScope apiScope;\n'
           '    $ARGUMENTS_DECLARATION;\n'
-          '    $(RETURN_PREFIX)m_callback.handleEvent($ARGUMENT_COUNT, arguments);\n'
+          '    return m_callback.handleEvent($ARGUMENT_COUNT, arguments);\n'
           '}\n',
-          TYPE=native_return_type,
           CLASS_NAME=class_name,
           PARAMETERS=', '.join(parameters),
-          ERROR_RETURN=error_return,
-          RETURN_PREFIX=return_prefix,
           ARGUMENTS_DECLARATION=arguments_declaration,
           ARGUMENT_COUNT=len(arguments))
 
     cpp_header_path = self._FilePathForCppHeader(self._interface.id)
     cpp_header_emitter = self._emitters.FileEmitter(cpp_header_path)
     cpp_header_emitter.Emit(
         self._templates.Load('cpp_callback_header.template'),
         INTERFACE=self._interface.id,
         HANDLERS=cpp_header_handlers_emitter.Fragments())
 
@@ skipping 857 matching lines @@
     parent_interface = _FindInHierarchy(database, parent_interface, test)
     if parent_interface:
       return parent_interface
 
 def _ToWebKitName(name):
   name = name[0].lower() + name[1:]
   name = re.sub(r'^(hTML|uRL|jS|xML|xSLT)', lambda s: s.group(1).lower(),
                 name)
   return re.sub(r'^(create|exclusive)', lambda s: 'is' + s.group(1).capitalize(),
                 name)