Emit parameters directly, w/o auxilary emitter.

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 685 matching lines @@
       self._cpp_impl_includes.add('"DOMWindow.h"')
       cpp_arguments = ['document']
 
     if 'Reflect' in ext_attrs:
       cpp_arguments = [self._GenerateWebCoreReflectionAttributeName(node)]
 
     for argument in arguments:
       if self._TypeInfo(argument.type.id).requires_v8_scope():
         requires_v8_scope = True
 
-    parameter_definitions_emitter = emitter.Emitter()
-    # Process Dart cpp_arguments.
-    start_index = 0
-    if needs_receiver:
-      start_index = 1
-    for (i, argument) in enumerate(arguments):
-      if (i == len(arguments) - 1 and
-          self._interface.id == 'Console' and
-          argument.id == 'arg'):
-        # FIXME: we are skipping last argument here because it was added in
-        # supplemental dart.idl. Cleanup dart.idl and remove this check.
-        break
-      argument_expression = self._GenerateToNative(
-          parameter_definitions_emitter, argument, start_index + i)
-      cpp_arguments.append(argument_expression)
-
-    # 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')
-
-    if self._interface.id == 'CSSStyleDeclaration' and node.id == 'setProperty':
-      # CSSStyleDeclaration.setProperty priority parameter is optional in Dart
-      # idl, but is not optional in webcore implementation.
-      if len(arguments) == 2:
-        cpp_arguments.append('String()')
-
-    if 'NeedsUserGestureCheck' in ext_attrs:
-      cpp_arguments.append('DartUtilities::processingUserGesture');
-
     assert (not (
       'synthesizedV8EnabledPerContext' in ext_attrs and
       'synthesizedV8EnabledAtRuntime' in ext_attrs))
     if 'synthesizedV8EnabledPerContext' in ext_attrs:
       raises_exceptions = True
       self._cpp_impl_includes.add('"ContextFeatures.h"')
       self._cpp_impl_includes.add('"DOMWindow.h"')
       runtime_check = emitter.Format(
           '        if (!ContextFeatures::$(FEATURE)Enabled(DartUtilities::domWindowForCurrentIsolate()->document())) {\n'
           '            exception = Dart_NewString("Feature $FEATURE is not enabled");\n'
           '            goto fail;\n'
           '        }',
           FEATURE=ext_attrs['synthesizedV8EnabledPerContext'])
 
     if 'synthesizedV8EnabledAtRuntime' in ext_attrs:
       raises_exceptions = True
       self._cpp_impl_includes.add('"RuntimeEnabledFeatures.h"')
       runtime_check = emitter.Format(
           '        if (!RuntimeEnabledFeatures::$(FEATURE)Enabled()) {\n'
           '            exception = Dart_NewString("Feature $FEATURE is not enabled");\n'
           '            goto fail;\n'
           '        }',
           FEATURE=_ToWebKitName(ext_attrs['synthesizedV8EnabledAtRuntime']))
 
-    invocation = self._GenerateWebCoreInvocation(
-        function_expression, cpp_arguments, return_type, ext_attrs, raises_dom_exception)
-
     head_emitter = emitter.Emitter()
 
     if requires_v8_scope:
       head_emitter.Emit(
           '        V8Scope v8scope;\n\n')
 
     if runtime_check:
       head_emitter.Emit(
           '$RUNTIME_CHECK\n',
           RUNTIME_CHECK=runtime_check)
@@ skipping 25 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))
 
-    head_emitter.Emit(
-        '$PARAMETE_DEFINITIONS\n',
-        PARAMETE_DEFINITIONS=parameter_definitions_emitter.Fragments())
+    # Process Dart cpp_arguments.
+    start_index = 0
+    if needs_receiver:
+      start_index = 1
+    for (i, argument) in enumerate(arguments):
+      if (i == len(arguments) - 1 and
+          self._interface.id == 'Console' and
+          argument.id == 'arg'):
+        # FIXME: we are skipping last argument here because it was added in
+        # supplemental dart.idl. Cleanup dart.idl and remove this check.
+        break
+      argument_expression = self._GenerateToNative(head_emitter, argument, start_index + i)
+      cpp_arguments.append(argument_expression)
+
+    head_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')
+
+    if self._interface.id == 'CSSStyleDeclaration' and node.id == 'setProperty':
+      # CSSStyleDeclaration.setProperty priority parameter is optional in Dart
+      # idl, but is not optional in webcore implementation.
+      if len(arguments) == 2:
+        cpp_arguments.append('String()')
+
+    if 'NeedsUserGestureCheck' in ext_attrs:
+      cpp_arguments.append('DartUtilities::processingUserGesture');
+
+    invocation = self._GenerateWebCoreInvocation(
+        function_expression, cpp_arguments, return_type, ext_attrs, raises_dom_exception)
 
     body = emitter.Format(
         '    {\n'
         '$HEAD'
         '$INVOCATION'
         '        return;\n'
         '    }\n',
         HEAD=head_emitter.Fragments(),
         INVOCATION=invocation)
 
@@ skipping 125 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)