- Modify toDart to first do a simple lookup in the appropriate table before going down the templati…

tools/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 json
@@ skipping 691 matching lines @@
   def receiver(self):
     return 'receiver->'
 
   def conversion_includes(self):
     includes = [self._idl_type] + (self._data.conversion_includes or [])
     return ['"Dart%s.h"' % include for include in includes]
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     return 'Dart%s::toDart(%s)' % (self._idl_type, value)
 
+  def return_to_dart_conversion(self, value,
+                                interface_name=None, attributes=None):
+    return 'Dart%s::returnToDart(args, %s)' % (self._idl_type, value)
+
   def custom_to_dart(self):
     return self._data.custom_to_dart
 
 
 class InterfaceIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, data, dart_interface_name, type_registry):
     super(InterfaceIDLTypeInfo, self).__init__(idl_type, data)
     self._dart_interface_name = dart_interface_name
     self._type_registry = type_registry
 
@@ skipping 103 matching lines @@
 
     return native_type
 
   def pass_native_by_ref(self): return True
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     if isinstance(self._item_info, PrimitiveIDLTypeInfo):
       return 'DartDOMWrapper::vectorToDart(%s)' % value
     return 'DartDOMWrapper::vectorToDart<%s>(%s)' % (self._item_info.bindings_class(), value)
 
+  def return_to_dart_conversion(self, value,
+                                interface_name=None, attributes=None):
+    return 'Dart_SetReturnValue(args, %s)' % self.to_dart_conversion(
+        value,
+        interface_name,
+        attributes)
+
   def conversion_includes(self):
     return self._item_info.conversion_includes()
 
 
 class DOMStringArrayTypeInfo(SequenceIDLTypeInfo):
   def __init__(self, data, item_info):
     super(DOMStringArrayTypeInfo, self).__init__('DOMString[]', data, item_info)
 
   def to_native_info(self, idl_node, interface_name):
     return '%s', 'RefPtr<DOMStringList>', 'DartDOMStringList', 'toNative'
@@ skipping 37 matching lines @@
     if self.idl_type() == 'Date':
       function_name = 'date'
     else:
       function_name = self._capitalized_native_type()
       function_name = function_name[0].lower() + function_name[1:]
     function_name = 'DartUtilities::%sToDart' % function_name
     if attributes and 'TreatReturnedNullStringAs' in attributes:
       function_name += 'WithNullCheck'
     return '%s(%s)' % (function_name, value)
 
+  def return_to_dart_conversion(self, value,
+                                interface_name=None, attributes=None):
+    return 'Dart_SetReturnValue(args, %s)' % self.to_dart_conversion(
+        value,
+        interface_name,
+        attributes)
+
   def webcore_getter_name(self):
     return self._data.webcore_getter_name
 
   def webcore_setter_name(self):
     return self._data.webcore_setter_name
 
   def _capitalized_native_type(self):
     return re.sub(r'(^| )([a-z])', lambda x: x.group(2).upper(), self.native_type())
 
 
 class SVGTearOffIDLTypeInfo(InterfaceIDLTypeInfo):
   def __init__(self, idl_type, data, interface_name, type_registry):
     super(SVGTearOffIDLTypeInfo, self).__init__(
         idl_type, data, interface_name, type_registry)
 
   def native_type(self):
     if self._data.native_type:
       return self._data.native_type
     tear_off_type = 'SVGPropertyTearOff'
     if self._idl_type.endswith('List'):
       tear_off_type = 'SVGListPropertyTearOff'
     return '%s<%s>' % (tear_off_type, self._idl_type)
 
   def receiver(self):
     if self._idl_type.endswith('List'):
       return 'receiver->'
     return 'receiver->propertyReference().'
 
-  def to_dart_conversion(self, value, interface_name, attributes):
+  def to_conversion_cast(self, value, interface_name, attributes):
     svg_primitive_types = ['SVGAngle', 'SVGLength', 'SVGMatrix',
         'SVGNumber', 'SVGPoint', 'SVGRect', 'SVGTransform']
     conversion_cast = '%s::create(%s)'
     if interface_name.startswith('SVGAnimated'):
       conversion_cast = 'static_cast<%s*>(%s)'
     elif self.idl_type() == 'SVGStringList':
       conversion_cast = '%s::create(receiver, %s)'
     elif interface_name.endswith('List'):
       conversion_cast = 'static_cast<%s*>(%s.get())'
     elif self.idl_type() in svg_primitive_types:
       conversion_cast = '%s::create(%s)'
     else:
       conversion_cast = 'static_cast<%s*>(%s)'
     conversion_cast = conversion_cast % (self.native_type(), value)
-    return 'Dart%s::toDart(%s)' % (self._idl_type, conversion_cast)
+    return '%s' % (conversion_cast)
+
+  def to_dart_conversion(self, value, interface_name, attributes):
+    return 'Dart%s::toDart(%s)' % (self._idl_type, self.to_conversion_cast(value, interface_name, attributes))
+
+  def return_to_dart_conversion(self, value, interface_name, attr):
+    return 'Dart%s::returnToDart(args, %s)' % (self._idl_type,
+                                               self.to_conversion_cast(
+                                                   value,
+                                                   interface_name,
+                                                   attr))
 
   def argument_expression(self, name, interface_name):
     return name if interface_name.endswith('List') else '%s->propertyReference()' % name
 
 
 class TypedListIDLTypeInfo(InterfaceIDLTypeInfo):
   def __init__(self, idl_type, data, interface_name, type_registry):
     super(TypedListIDLTypeInfo, self).__init__(
         idl_type, data, interface_name, type_registry)
 
   def conversion_includes(self):
     return [ '"wtf/%s.h"' % self._idl_type ]
 
   def to_dart_conversion(self, value, interface_name, attributes):
     return 'DartUtilities::arrayBufferViewToDart(%s)' % value
 
+  def return_to_dart_conversion(self, value, interface_name, attributes):
+    return 'Dart_SetReturnValue(args, %s)' % self.to_dart_conversion(
+        value,
+        interface_name,
+        attributes)
+
   def to_native_info(self, idl_node, interface_name):
     return '%s.get()', 'RefPtr<%s>' % self._idl_type, 'DartUtilities', 'dartTo%s' % self._idl_type
 
 
 class BasicTypedListIDLTypeInfo(InterfaceIDLTypeInfo):
   def __init__(self, idl_type, data, interface_name, type_registry):
     super(BasicTypedListIDLTypeInfo, self).__init__(
         idl_type, data, interface_name, type_registry)
 
   def conversion_includes(self):
     return []
 
   def to_dart_conversion(self, value, interface_name, attributes):
     function_name = 'DartUtilities::%sToDart' % self._idl_type
     function_name = function_name[0].lower() + function_name[1:]
     return '%s(%s)' % (function_name, value)
 
+  def return_to_dart_conversion(self, value, interface_name, attributes):
+    return 'Dart_SetReturnValue(args, %s)' % self.to_dart_conversion(
+        value,
+        interface_name,
+        attributes)
+
   def to_native_info(self, idl_node, interface_name):
     return '%s.get()', 'RefPtr<%s>' % self._idl_type, 'DartUtilities', 'dartTo%s' % self._idl_type
 
 
 class TypeData(object):
   def __init__(self, clazz, dart_type=None, native_type=None,
                merged_interface=None, merged_into=None,
                custom_to_dart=False, custom_to_native=False,
                conversion_includes=None,
                webcore_getter_name='getAttribute',
@@ skipping 220 matching lines @@
     if type_data.clazz == 'BasicTypedList':
       if type_name == 'ArrayBuffer':
         dart_interface_name = 'ByteBuffer'
       else:
         dart_interface_name = self._renamer.RenameInterfaceId(type_name)
       return BasicTypedListIDLTypeInfo(
           type_name, type_data, dart_interface_name, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)