Remove ParameterAdapters for all types except for String.

lib/dom/scripts/generator.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 systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import re
@@ skipping 637 matching lines @@
 class PrimitiveIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, dart_type, native_type=None,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute'):
     super(PrimitiveIDLTypeInfo, self).__init__(idl_type, dart_type=dart_type,
         native_type=native_type)
     self._webcore_getter_name = webcore_getter_name
     self._webcore_setter_name = webcore_setter_name
 
   def emit_to_native(self, emitter, idl_node, name, handle, interface_name):
-    arguments = [handle]
-    if idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString':
-      arguments.append('DartUtilities::ConvertNullToDefaultValue')
-    emitter.Emit(
-        '\n'
-        '        const ParameterAdapter<$TYPE> $NAME($ARGUMENTS);\n'
-        '        if (!$NAME.conversionSuccessful()) {\n'
-        '            exception = $NAME.exception();\n'
-        '            goto fail;\n'
-        '        }\n',
-        TYPE=self.native_type(),
-        NAME=name,
-        ARGUMENTS=', '.join(arguments))
+    if self.native_type() == 'String':

[Anton Muhin, 2012/06/26 12:56:41]

maybe introduce a separate typeinfo for String and SerializedScriptValue?

[podivilov, 2012/06/26 13:14:49]

We need to refactor string conversions first. Then it would be clear if we need
such separation at all.

[Anton Muhin, 2012/06/26 13:24:43]

What do you mean be refactor string conversions?

On 2012/06/26 13:14:49, podivilov wrote:

+      arguments = [handle]
+      if idl_node.ext_attrs.get('Optional') == 'DefaultIsNullString':
+        arguments.append('DartUtilities::ConvertNullToDefaultValue')
+      emitter.Emit(
+          '        const ParameterAdapter<String> $NAME($ARGUMENTS);\n'
+          '        if (!$NAME.conversionSuccessful()) {\n'
+          '            exception = $NAME.exception();\n'
+          '            goto fail;\n'
+          '        }\n',
+          NAME=name,
+          ARGUMENTS=', '.join(arguments))
+    else:
+      type = self.native_type()
+      if type == 'SerializedScriptValue':
+        type = 'RefPtr<%s>' % type
+      emitter.Emit(
+          '\n'
+          '        $TYPE $NAME = DartUtilities::dartTo$CAPITALIZED_TYPE($HANDLE, exception);\n'
+          '        if (exception)\n'
+          '            goto fail;\n',
+          TYPE=type,
+          NAME=name,
+          CAPITALIZED_TYPE=self._capitalized_native_type(),
+          HANDLE=handle)
     return name
 
   def parameter_type(self):
     if self.native_type() == 'String':
       return 'const String&'
     return self.native_type()
 
   def conversion_includes(self):
     return []
 
   def to_native_includes(sefl):
     return []
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     conversion_arguments = [value]
     if attributes and 'TreatReturnedNullStringAs' in attributes:
       conversion_arguments.append('DartUtilities::ConvertNullToDefaultValue')
-    function_name = re.sub(r' [a-z]', lambda x: x.group(0)[1:].upper(), self.native_type())
+    function_name = self._capitalized_native_type()
     function_name = function_name[0].lower() + function_name[1:]
     function_name = 'DartUtilities::%sToDart' % function_name
     return '%s(%s)' % (function_name, ', '.join(conversion_arguments))
 
   def webcore_getter_name(self):
     return self._webcore_getter_name
 
   def webcore_setter_name(self):
     return self._webcore_setter_name
 
+  def _capitalized_native_type(self):
+    def replace(match):
+      return match.group(2)[0].upper() + match.group(2)[1:]
+    return re.sub(r'(^| )([a-z]\w*)', replace, self.native_type())

[Anton Muhin, 2012/06/26 12:56:41]

why it changed?

[podivilov, 2012/06/26 13:14:49]

It's now used to generate both fooBarToDart and dartToFooBar.

[Anton Muhin, 2012/06/26 13:24:43]

What's the difference in semantics except for 1st char?  E.g. why you use
([a-z]\w+) now?

On 2012/06/26 13:14:49, podivilov wrote:

[podivilov, 2012/06/26 13:58:31]

Done.

+
+
 class SVGTearOffIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, native_type=''):
     super(SVGTearOffIDLTypeInfo, self).__init__(idl_type,
                                                 native_type=native_type)
 
   def native_type(self):
     if self._native_type:
       return self._native_type
     tear_off_type = 'SVGPropertyTearOff'
     if self._idl_type.endswith('List'):
@@ skipping 122 matching lines @@
 
   match = re.match(r'sequence<(\w+)>$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
 
   match = re.match(r'(\w+)\[\]$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
 
   return IDLTypeInfo(idl_type_name)