Parameter adapter name in setter should be 'value'.

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
 import systemwrapping
 from generator import *
 from systembase import *
 
-
-_cpp_keywords = set(['default', 'operator'])
-
-def CppSafeName(name):
-  """Returns version of name safe for use in cpp code, i.e. not a keyword."""
-  if name in _cpp_keywords:
-    return '_' + name
-  return name
-
 class NativeImplementationSystem(System):
 
   def __init__(self, templates, database, emitters, auxiliary_dir, output_dir):
     super(NativeImplementationSystem, self).__init__(
         templates, database, emitters, output_dir)
 
     self._auxiliary_dir = auxiliary_dir
     self._dom_public_files = []
     self._dom_impl_files = []
     self._cpp_header_files = []
@@ skipping 248 matching lines @@
             '        if (!context) {\n'
             '            exception = Dart_NewString("Failed to create an object");\n'
             '            goto fail;\n'
             '        }\n')
         arguments.append('context')
       else:
         raise Exception('Unsupported CallWith=%s attribute' % call_with)
 
     # Process constructor arguments.
     for (i, arg) in enumerate(constructor_info.idl_args):
-      cpp_arg_name = CppSafeName(arg.id)

[podivilov, 2012/03/13 12:48:13]

c++ keywords are never used as parameter names in WebKit idls, as it would cause
troubles in all native bindings.

-      self._GenerateParameterAdapter(
-          parameter_definitions_emitter, arg, cpp_arg_name, i - 1)
-      arguments.append(cpp_arg_name)
+      self._GenerateParameterAdapter(parameter_definitions_emitter, arg, i - 1)
+      arguments.append(arg.id)
 
     function_expression = '%s::%s' % (self._interface_type_info.native_type(), create_function)
     invocation = self._GenerateWebCoreInvocation(function_expression, arguments,
         self._interface.id, self._interface.ext_attrs, raises_dom_exceptions)
     self._GenerateNativeCallback(callback_name='constructorCallback',
         parameter_definitions=parameter_definitions_emitter.Fragments(),
         needs_receiver=False, invocation=invocation,
         raises_exceptions=raises_dart_exceptions)
 
   def _ImplClassName(self, interface_name):
@@ skipping 89 matching lines @@
     arguments = []
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = GetIDLTypeInfo(attr.type.id).webcore_getter_name()
       if 'URL' in attr.ext_attrs:
         if 'NonEmpty' in attr.ext_attrs:
           webcore_function_name = 'getNonEmptyURLAttribute'
         else:
           webcore_function_name = 'getURLAttribute'
       arguments.append(self._GenerateWebCoreReflectionAttributeName(attr))
     else:
-      webcore_function_name = CppSafeName(attr.id)
-      if attr.id == 'target' and attr.type.id == 'SVGAnimatedString':
+      if attr.id == 'operator':

[podivilov, 2012/03/13 12:48:13]

operator -> _operator rename is rather just a special case than a general rule
used in WebKit. Next time, it could be implemented in c++ as "operatorValue" or
"operator_" or whatever.

+        webcore_function_name = '_operator'
+      elif attr.id == 'target' and attr.type.id == 'SVGAnimatedString':
         webcore_function_name = 'svgTarget'
       else:
         webcore_function_name = re.sub(r'^(HTML|URL|JS|XML|XSLT|\w)',
                                        lambda s: s.group(1).lower(),
-                                       webcore_function_name)
+                                       attr.id)
         webcore_function_name = re.sub(r'^(create|exclusive)',
                                        lambda s: 'is' + s.group(1).capitalize(),
                                        webcore_function_name)
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     invocation = self._GenerateWebCoreInvocation(function_expression,
         arguments, attr.type.id, attr.ext_attrs, attr.get_raises)
     self._GenerateNativeCallback(cpp_callback_name, '', True, invocation,
@@ skipping 14 matching lines @@
       webcore_function_name = GetIDLTypeInfo(attr.type.id).webcore_setter_name()
       arguments.append(self._GenerateWebCoreReflectionAttributeName(attr))
     else:
       webcore_function_name = re.sub(r'^(xml(?=[A-Z])|\w)',
                                      lambda s: s.group(1).upper(),
                                      attr.id)
       webcore_function_name = 'set%s' % webcore_function_name
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
-    cpp_arg_name = CppSafeName(attr.id)
-    arguments.append(cpp_arg_name)
+    arguments.append('value')
 
     parameter_definitions_emitter = emitter.Emitter()
     self._GenerateParameterAdapter(
-        parameter_definitions_emitter, attr, cpp_arg_name, 0)
+        parameter_definitions_emitter, attr, 0, adapter_name='value')
     parameter_definitions = parameter_definitions_emitter.Fragments()
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     invocation = self._GenerateWebCoreInvocation(function_expression,
         arguments, 'void', attr.ext_attrs, attr.set_raises)
 
     self._GenerateNativeCallback(cpp_callback_name, parameter_definitions,
         True, invocation, raises_exceptions=True)
 
   def _HasNativeIndexGetter(self, interface):
@@ skipping 122 matching lines @@
         arguments.extend(['scriptArguments', 'scriptCallStack'])
 
     # Process Dart arguments.
     for (i, argument) in enumerate(operation.arguments):
       if (i == len(operation.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
-      cpp_arg_name = CppSafeName(argument.id)

[podivilov, 2012/03/13 12:48:13]

ditto.

-      self._GenerateParameterAdapter(
-          parameter_definitions_emitter, argument, cpp_arg_name, i)
-      arguments.append(cpp_arg_name)
+      self._GenerateParameterAdapter(parameter_definitions_emitter, argument, i)
+      arguments.append(argument.id)
 
     if operation.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(operation.arguments) == 2:
         arguments.append('false')
 
     if self._interface.id == 'CSSStyleDeclaration' and operation.id == 'setProperty':
       # CSSStyleDeclaration.setProperty priority parameter is optional in Dart
       # idl, but is not optional in webcore implementation.
@@ skipping 43 matching lines @@
     self._cpp_definitions_emitter.Emit(
         '\n'
         'static void $CALLBACK_NAME(Dart_NativeArguments args)\n'
         '{\n'
         '    DartApiScope dartApiScope;\n'
         '$BODY'
         '}\n',
         CALLBACK_NAME=callback_name,
         BODY=body)
 
-  def _GenerateParameterAdapter(self, emitter, idl_node, name, index):
+  def _GenerateParameterAdapter(self, emitter, idl_node, index,
+                                adapter_name=None):
     """idl_node is IDLArgument or IDLAttribute."""
     type_info = GetIDLTypeInfo(idl_node.type.id)
     (adapter_type, include_name) = type_info.parameter_adapter_info()
     if include_name:
       self._cpp_impl_includes.add(include_name)
     flags = ''
     if (idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString' or
         'RequiredCppParameter' in idl_node.ext_attrs):
       flags = ', DartUtilities::ConvertNullToDefaultValue'
     emitter.Emit(
         '\n'
         '        const $ADAPTER_TYPE $NAME(Dart_GetNativeArgument(args, $INDEX)$FLAGS);\n'
         '        if (!$NAME.conversionSuccessful()) {\n'
         '            exception = $NAME.exception();\n'
         '            goto fail;\n'
         '        }\n',
         ADAPTER_TYPE=adapter_type,
-        NAME=name,
+        NAME=adapter_name or idl_node.id,
         INDEX=index + 1,
         FLAGS=flags)
 
   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)
@@ skipping 83 matching lines @@
 
     if 'ImplementedBy' in attributes:
       arguments.insert(0, 'receiver')
       self._cpp_impl_includes.add(attributes['ImplementedBy'])
 
     return emitter.Format(invocation_template,
         FUNCTION_CALL='%s(%s)' % (function_expression, ', '.join(arguments)))
 
 def _GenerateCPPIncludes(includes):
   return ''.join(['#include "%s.h"\n' % include for include in includes])