Proper support for IDL arrays in generators.

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 584 matching lines @@
     else:
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
 
   def receiver(self):
     return 'receiver->'
 
   def conversion_includes(self):
     return ['"Dart%s.h"' % include for include in self._conversion_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._custom_to_dart
 
 
 class SequenceIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, item_info):
     super(SequenceIDLTypeInfo, self).__init__(idl_type)
     self._item_info = item_info
 
   def dart_type(self):
     return 'List<%s>' % self._item_info.dart_type()
 
   def to_dart_conversion(self, value, interface_name=None, attributes=None):
     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):
+    super(DOMStringArrayTypeInfo, self).__init__('DOMString[]', _dom_string_type_info)
+
+  def emit_to_native(self, emitter, idl_node, name, handle, interface_name):
+    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"']
+
+
 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):
@@ skipping 13 matching lines @@
     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 = 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):
@@ skipping 30 matching lines @@
       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)
 
+_dom_string_type_info = PrimitiveIDLTypeInfo(
+    'DOMString', dart_type='String', native_type='String')
+
 _idl_type_registry = {
     'boolean': PrimitiveIDLTypeInfo('boolean', dart_type='bool', native_type='bool',
                                     webcore_getter_name='hasAttribute',
                                     webcore_setter_name='setBooleanAttribute'),
     'byte': PrimitiveIDLTypeInfo('byte', dart_type='int', native_type='int'),
     'octet': PrimitiveIDLTypeInfo('octet', dart_type='int', native_type='int'),
     'short': PrimitiveIDLTypeInfo('short', dart_type='int', native_type='int'),
     'unsigned short': PrimitiveIDLTypeInfo('unsigned short', dart_type='int',
         native_type='int'),
     'int': PrimitiveIDLTypeInfo('int', dart_type='int'),
     'unsigned int': PrimitiveIDLTypeInfo('unsigned int', dart_type='int',
         native_type='unsigned'),
     'long': PrimitiveIDLTypeInfo('long', dart_type='int', native_type='int',
         webcore_getter_name='getIntegralAttribute',
         webcore_setter_name='setIntegralAttribute'),
     'unsigned long': PrimitiveIDLTypeInfo('unsigned long', dart_type='int',
         native_type='unsigned',
         webcore_getter_name='getUnsignedIntegralAttribute',
         webcore_setter_name='setUnsignedIntegralAttribute'),
     'long long': PrimitiveIDLTypeInfo('long long', dart_type='int'),
     'unsigned long long': PrimitiveIDLTypeInfo('unsigned long long', dart_type='int'),
     'float': PrimitiveIDLTypeInfo('float', dart_type='num', native_type='double'),
     'double': PrimitiveIDLTypeInfo('double', dart_type='num'),
 
     'any': PrimitiveIDLTypeInfo('any', dart_type='Object'),
-    'any[]': PrimitiveIDLTypeInfo('any[]', dart_type='List'),
     'Array': PrimitiveIDLTypeInfo('Array', dart_type='List'),
     'custom': PrimitiveIDLTypeInfo('custom', dart_type='Dynamic'),
     'Date': PrimitiveIDLTypeInfo('Date', dart_type='Date', native_type='double'),
     'DOMObject': PrimitiveIDLTypeInfo('DOMObject', dart_type='Object', native_type='ScriptValue'),
-    'DOMString': PrimitiveIDLTypeInfo('DOMString', dart_type='String', native_type='String'),
+    'DOMString': _dom_string_type_info,
     # TODO(vsm): This won't actually work until we convert the Map to
     # a native JS Map for JS DOM.
     'Dictionary': PrimitiveIDLTypeInfo('Dictionary', dart_type='Map'),
     # TODO(sra): Flags is really a dictionary: {create:bool, exclusive:bool}
     # http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-flags-interface
     'Flags': PrimitiveIDLTypeInfo('Flags', dart_type='Object'),
     'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp', dart_type='int', native_type='unsigned long long'),
     'object': PrimitiveIDLTypeInfo('object', dart_type='Object', native_type='ScriptValue'),
     'PositionOptions': PrimitiveIDLTypeInfo('PositionOptions', dart_type='Object'),
     # TODO(sra): Come up with some meaningful name so that where this appears in
     # the documentation, the user is made aware that only a limited subset of
     # serializable types are actually permitted.
     'SerializedScriptValue': PrimitiveIDLTypeInfo('SerializedScriptValue', dart_type='Dynamic'),
     # TODO(sra): Flags is really a dictionary: {create:bool, exclusive:bool}
     # http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-flags-interface
     'WebKitFlags': PrimitiveIDLTypeInfo('WebKitFlags', dart_type='Object'),
 
     'sequence': PrimitiveIDLTypeInfo('sequence', dart_type='List'),
     'void': PrimitiveIDLTypeInfo('void', dart_type='void'),
 
     'CSSRule': IDLTypeInfo('CSSRule', conversion_includes=['CSSImportRule']),
     'DOMException': IDLTypeInfo('DOMException', native_type='DOMCoreException'),
+    'DOMString[]': DOMStringArrayTypeInfo(),

[podivilov, 2012/06/21 08:33:57]

Up to you, but I really prefer a special case in GetIDLTypeInfo.

     'DOMStringList': IDLTypeInfo('DOMStringList', dart_type='List<String>', custom_to_native=True),
     'DOMStringMap': IDLTypeInfo('DOMStringMap', dart_type='Map<String, String>'),
     'DOMWindow': IDLTypeInfo('DOMWindow', custom_to_dart=True),
     'Element': IDLTypeInfo('Element', custom_to_dart=True),
     'EventListener': IDLTypeInfo('EventListener', custom_to_native=True),
     'EventTarget': IDLTypeInfo('EventTarget', custom_to_native=True),
     'HTMLElement': IDLTypeInfo('HTMLElement', custom_to_dart=True),
     'IDBAny': IDLTypeInfo('IDBAny', dart_type='Dynamic', custom_to_native=True),
     'IDBKey': IDLTypeInfo('IDBKey', dart_type='Dynamic', custom_to_native=True),
     'StyleSheet': IDLTypeInfo('StyleSheet', conversion_includes=['CSSStyleSheet']),
@@ skipping 18 matching lines @@
 _svg_supplemental_includes = [
     '"SVGAnimatedPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGStaticListPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGTransformListPropertyTearOff.h"',
     '"SVGPathSegListPropertyTearOff.h"',
 ]
 
 def GetIDLTypeInfo(idl_type_name):
+  type_info = _idl_type_registry.get(idl_type_name)
+  if type_info is not None:
+    return type_info
+
   match = re.match(r'sequence<(\w+)>$', idl_type_name)
   if match:
     return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
-  return _idl_type_registry.get(idl_type_name, IDLTypeInfo(idl_type_name))
+
+  match = re.match(r'(\w+)\[\]$', idl_type_name)
+  if match:
+    return SequenceIDLTypeInfo(idl_type_name, GetIDLTypeInfo(match.group(1)))
+
+  return IDLTypeInfo(idl_type_name)