Minor rework of argument emission.

lib/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 779 matching lines @@
           '\n'
           '        Dart_Handle customArgument = Dart_GetNativeArgument(args, $INDEX);\n'
           '        RefPtr<ScriptArguments> scriptArguments(DartUtilities::createScriptArguments(customArgument, exception));\n'
           '        if (!scriptArguments)\n'
           '            goto fail;\n'
           '        RefPtr<ScriptCallStack> scriptCallStack(DartUtilities::createScriptCallStack());\n'
           '        if (!scriptCallStack->size())\n'
           '            return;\n',
           INDEX=len(arguments) + 1)
 
-    # Process Dart cpp_arguments.
+    # Emit arguments.
     start_index = 1 if needs_receiver else 0
     for i, argument in enumerate(arguments):
-      argument_expression = self._GenerateToNative(body_emitter, argument, start_index + i)
-      cpp_arguments.append(argument_expression)
+      type_info = self._TypeInfo(argument.type.id)
+      self._cpp_impl_includes |= set(type_info.to_native_includes())
+      cpp_arguments.append(type_info.emit_to_native(
+          body_emitter,
+          argument,
+          # TODO(antonm): all IDs should be renamed when database is generated.
+          # That will allow to get rid of argument_name argument altogether.
+          DartDomNameOfAttribute(argument),
+          'Dart_GetNativeArgument(args, %i)' % (start_index + i),
+          self._interface.id))
 
     body_emitter.Emit('\n')
 
     # FIXME: rework in IDLs.
     if node.id in ['addEventListener', 'removeEventListener']:
       # addEventListener's and removeEventListener's last argument is marked
       # as optional in idl, but is not optional in webcore implementation.
       if len(arguments) == 2:
         cpp_arguments.append('false')
 
@@ skipping 27 matching lines @@
       self._cpp_impl_includes |= set(return_type_info.conversion_includes())
 
       # Generate to Dart conversion of C++ value.
       to_dart_conversion = return_type_info.to_dart_conversion(function_call, self._interface.id, ext_attrs)
       invocation_emitter.Emit(
         '        Dart_Handle returnValue = $TO_DART_CONVERSION;\n'
         '        if (returnValue)\n'
         '            Dart_SetReturnValue(args, returnValue);\n',
         TO_DART_CONVERSION=to_dart_conversion)
 
-  def _GenerateToNative(self, emitter, idl_node, index):
-    """idl_node is IDLArgument or IDLAttribute."""
-    type_info = self._TypeInfo(idl_node.type.id)
-    self._cpp_impl_includes |= set(type_info.to_native_includes())
-    argument_name = idl_node.id
-    # Rename to get rid of conflicts with C++ keywords.
-    if argument_name == 'default':
-      argument_name = 'value'
-    handle = 'Dart_GetNativeArgument(args, %i)' % index
-    argument_expression = type_info.emit_to_native(
-        emitter, idl_node, argument_name, handle, self._interface.id)
-    return argument_expression
-
   def _GenerateNativeBinding(self, idl_name, argument_count, dart_declaration,
       native_suffix, is_custom):
     native_binding = '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
     self._members_emitter.Emit(
         '\n'
         '  $DART_DECLARATION native "$NATIVE_BINDING";\n',
         DART_DECLARATION=dart_declaration, NATIVE_BINDING=native_binding)
 
     cpp_callback_name = '%s%s' % (idl_name, native_suffix)
     self._cpp_resolver_emitter.Emit(
@@ skipping 52 matching lines @@
 
 def _IsArgumentOptionalInWebCore(argument):
   return IsOptional(argument) and not 'Callback' in argument.ext_attrs
 
 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)