Refactor conversion to native.

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 465 matching lines @@
 
   def dart_type(self):
     return self._data.dart_type or self._idl_type
 
   def native_type(self):
     return self._data.native_type or self._idl_type
 
   def requires_v8_scope(self):
     return self._data.requires_v8_scope
 
-  def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
+  def to_native_info(self, idl_node, accept_null, name, interface_name):
+    cls = 'Dart%s' % self.idl_type()
+
     if 'Callback' in idl_node.ext_attrs:
       function_name = 'create'
       if accept_null:
         function_name += 'WithNullCheck'
-      emitter.Emit(

[podivilov, 2012/08/21 12:11:31]

I believe we had an agreement that the code should move in the opposite
direction. We should probably discuss the general approach first.

-        '\n'
-        '        RefPtr<$TYPE> $NAME = Dart$IDL_TYPE::$FUNCTION_NAME($HANDLE, exception);\n'
-        '        if (exception)\n'
-        '            goto fail;\n',
-        TYPE=self.native_type(),
-        NAME=name,
-        FUNCTION_NAME=function_name,
-        IDL_TYPE=self.idl_type(),
-        HANDLE=handle)
-      return name
+      return name, 'RefPtr<%s>' % self.native_type(), cls, function_name
 
     argument = name
     if self.custom_to_native():
       type = 'RefPtr<%s>' % self.native_type()
       argument = '%s.get()' % name
     else:
       type = '%s*' % self.native_type()
       if isinstance(self, SVGTearOffIDLTypeInfo) and not interface_name.endswith('List'):
         argument = '%s->propertyReference()' % name
-    emitter.Emit(
-        '\n'
-        '        $TYPE $NAME = Dart$IDL_TYPE::toNative($HANDLE, exception);\n'
-        '        if (exception)\n'
-        '            goto fail;\n',
-        TYPE=type,
-        NAME=name,
-        IDL_TYPE=self.idl_type(),
-        HANDLE=handle)
-    return argument
+    return argument, type, cls, 'toNative'
 
   def custom_to_native(self):
     return self._data.custom_to_native
 
   def parameter_type(self):
     return '%s*' % self.native_type()
 
   def webcore_includes(self):
     WTF_INCLUDES = [
         'ArrayBuffer',
@@ skipping 23 matching lines @@
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
 
   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_native_includes(self):
-    return ['"Dart%s.h"' % self.idl_type()]
-
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     return 'Dart%s::toDart(%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):
     super(InterfaceIDLTypeInfo, self).__init__(idl_type, data)
@@ skipping 11 matching lines @@
     return 'DartDOMWrapper::vectorToDart<Dart%s>(%s)' % (self._item_info.native_type(), value)
 
   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 emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
+  def to_native_info(self, idl_node, accept_null, name, interface_name):
     assert not accept_null
-    emitter.Emit(
-        '\n'
-        '        RefPtr<DOMStringList> $NAME = DartDOMStringList::toNative($HANDLE, exception);\n'
-        '        if (exception)\n'
-        '            goto fail;\n',
-        NAME=name,
-        HANDLE=handle)
-    return name
-
-  def to_native_includes(self):
-    return ['"DartDOMStringList.h"']
+    return name, 'RefPtr<DOMStringList>', 'DartDOMStringList', 'toNative'
 
 
 class PrimitiveIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, data):
     super(PrimitiveIDLTypeInfo, self).__init__(idl_type, data)
 
-  def emit_to_native(self, emitter, idl_node, accept_null, name, handle, interface_name):
+  def to_native_info(self, idl_node, accept_null, name, interface_name):
     function_name = 'dartTo%s' % self._capitalized_native_type()
     if accept_null:
       function_name += 'WithNullCheck'
     type = self.native_type()
     if type == 'SerializedScriptValue':
       type = 'RefPtr<%s>' % type
     if type == 'String':
       type = 'DartStringAdapter'
-    emitter.Emit(
-        '\n'
-        '        $TYPE $NAME = DartUtilities::$FUNCTION_NAME($HANDLE, exception);\n'
-        '        if (exception)\n'
-        '            goto fail;\n',
-        TYPE=type,
-        NAME=name,
-        FUNCTION_NAME=function_name,
-        HANDLE=handle)
-    return name
+    return name, type, 'DartUtilities', function_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):
     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 webcore_getter_name(self):
     return self._data.webcore_getter_name
@@ skipping 176 matching lines @@
     if match:
       if type_name == 'DOMString[]':
         return DOMStringArrayTypeInfo(TypeData('Sequence'), self.TypeInfo('DOMString'))
       item_info = self.TypeInfo(match.group(1) or match.group(2))
       return SequenceIDLTypeInfo(type_name, TypeData('Sequence'), item_info)
     if not type_name in _idl_type_registry:
       return InterfaceIDLTypeInfo(type_name, TypeData('Interface'))
     type_data = _idl_type_registry.get(type_name)
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)