Introduce CompositeIDLTypeInfo and clean up the code that deals with sequences.

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 re
 
@@ skipping 423 matching lines @@
     self._ref_counted = ref_counted
     self._has_dart_wrapper = has_dart_wrapper
     self._conversion_template = conversion_template
     self._custom_to_dart = custom_to_dart
     self._conversion_includes = conversion_includes
 
   def idl_type(self):
     return self._idl_type
 
   def dart_type(self):
     if self._dart_type:

[Anton Muhin, 2012/04/18 14:25:53]

return self._dart_type or self._idl_type or it's too esoteric?

[podivilov, 2012/04/18 14:56:26]

Done.

       return self._dart_type
-
-    match = re.match(r'sequence<(\w*)>$', self._idl_type)
-    if match:
-      return 'List<%s>' % DartType(match.group(1))
-
     return self._idl_type
 
   def native_type(self):
     if self._native_type:
       return self._native_type
     return self._idl_type
 
   def parameter_adapter_info(self):
     native_type = self.native_type()
     if self._ref_counted:
@@ skipping 33 matching lines @@
     if self._idl_type.startswith('SVGPathSeg'):
       include = self._idl_type.replace('Abs', '').replace('Rel', '')
     else:
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
 
   def receiver(self):
     return 'receiver->'
 
   def conversion_includes(self):
-    def NeededDartTypes(type_name):
-      if re.match(r'Dynamic(\/.*)?$', type_name): return []
-      match = re.match(r'List<(\w*)>$', type_name)
-      if match:
-        return NeededDartTypes(match.group(1))
-      return [type_name]
-
     return ['"Dart%s.h"' % include
             for include in
-            NeededDartTypes(self.dart_type()) + self._conversion_includes]
+            [self.idl_type()] + self._conversion_includes]

[Anton Muhin, 2012/04/18 14:25:53]

maybe always add self.idl_type() into self._conversion_includes?

[podivilov, 2012/04/18 14:56:26]

Done.

 
   def conversion_cast(self, expression):
     if self._conversion_template:
       return self._conversion_template % expression
     return expression
 
   def custom_to_dart(self):
     return self._custom_to_dart
 
+
+class CompositeIDLTypeInfo(IDLTypeInfo):

[Anton Muhin, 2012/04/18 14:25:53]

do you want be that generic?  do we expect to have more than a list as a
collection?

[podivilov, 2012/04/18 14:56:26]

Done.

+  def __init__(self, idl_type, collection_info, item_info):
+    super(CompositeIDLTypeInfo, self).__init__(idl_type)
+    self._collection_info = collection_info
+    self._item_info = item_info
+
+  def dart_type(self):
+    collection_type = self._collection_info.dart_type()
+    item_type = self._item_info.dart_type()
+    return '%s<%s>' % (collection_type, item_type)
+
+  def conversion_includes(self):
+    return self._item_info.conversion_includes()
+
+
 class PrimitiveIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, dart_type, native_type=None, ref_counted=False,
-               conversion_template=None, conversion_includes=[],
+               conversion_template=None,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute'):
     super(PrimitiveIDLTypeInfo, self).__init__(idl_type, dart_type=dart_type,
         native_type=native_type, ref_counted=ref_counted,
-        conversion_template=conversion_template,
-        conversion_includes=conversion_includes)
+        conversion_template=conversion_template)
     self._webcore_getter_name = webcore_getter_name
     self._webcore_setter_name = webcore_setter_name
 
   def parameter_adapter_info(self):
     native_type = self.native_type()
     if self._ref_counted:
       native_type = 'RefPtr< %s >' % native_type
     return ('ParameterAdapter< %s >' % native_type, None)
 
   def parameter_type(self):
     if self.native_type() == 'String':
       return 'const String&'
     return self.native_type()
 
   def conversion_includes(self):
-    return ['"Dart%s.h"' % include for include in self._conversion_includes]
+    return []
 
   def webcore_getter_name(self):
     return self._webcore_getter_name
 
   def webcore_setter_name(self):
     return self._webcore_setter_name
 
 class SVGTearOffIDLTypeInfo(IDLTypeInfo):
   def __init__(self, idl_type, native_type='', ref_counted=True):
     super(SVGTearOffIDLTypeInfo, self).__init__(idl_type,
@@ skipping 55 matching lines @@
     'object': PrimitiveIDLTypeInfo('object', dart_type='Object', native_type='ScriptValue'),
     # 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', ref_counted=True),
     # 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'),
 
     'DOMStringList': PrimitiveIDLTypeInfo('DOMStringList', dart_type='List<String>'),
-    'DOMStringMap': PrimitiveIDLTypeInfo('DOMStringMap', dart_type='Map<String, String>',
-        conversion_includes=['DOMStringMap']),
     'sequence': PrimitiveIDLTypeInfo('sequence', dart_type='List'),
     'void': PrimitiveIDLTypeInfo('void', dart_type='void'),
 
     'CSSRule': IDLTypeInfo('CSSRule', conversion_includes=['CSSImportRule']),
     'DOMException': IDLTypeInfo('DOMCoreException', dart_type='DOMException'),
+    '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', has_dart_wrapper=False),
     'EventTarget': IDLTypeInfo('EventTarget', has_dart_wrapper=False),
     'HTMLElement': IDLTypeInfo('HTMLElement', custom_to_dart=True),
-    'IDBAny': IDLTypeInfo('IDBAny', dart_type='Dynamic',
-                          native_type='IDBAny',
-                          has_dart_wrapper=False,
-                          conversion_includes=['IDBAny']),
-    'IDBKey': IDLTypeInfo('IDBKey', dart_type='Dynamic',
-                          native_type='IDBKey',
-                          has_dart_wrapper=False,
-                          conversion_includes=['IDBKey']),
+    'IDBAny': IDLTypeInfo('IDBAny', dart_type='Dynamic', has_dart_wrapper=False),
+    'IDBKey': IDLTypeInfo('IDBKey', dart_type='Dynamic', has_dart_wrapper=False),
     'MediaQueryListListener': IDLTypeInfo('MediaQueryListListener', has_dart_wrapper=False),
     'OptionsObject': IDLTypeInfo('OptionsObject', has_dart_wrapper=False),
     'StyleSheet': IDLTypeInfo('StyleSheet', conversion_includes=['CSSStyleSheet']),
     'SVGElement': IDLTypeInfo('SVGElement', custom_to_dart=True),
 
     'SVGAngle': SVGTearOffIDLTypeInfo('SVGAngle'),
     'SVGLength': SVGTearOffIDLTypeInfo('SVGLength'),
     'SVGLengthList': SVGTearOffIDLTypeInfo('SVGLengthList', ref_counted=False),
     'SVGMatrix': SVGTearOffIDLTypeInfo('SVGMatrix'),
     'SVGNumber': SVGTearOffIDLTypeInfo('SVGNumber', native_type='SVGPropertyTearOff<float>'),
@@ skipping 11 matching lines @@
 _svg_supplemental_includes = [
     '"SVGAnimatedPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGStaticListPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGTransformListPropertyTearOff.h"',
     '"SVGPathSegListPropertyTearOff.h"',
 ]
 
 def GetIDLTypeInfo(idl_type_name):
+  match = re.match(r'(\w+)<(\w+)>$', idl_type_name)
+  if match:
+    collection_info = GetIDLTypeInfo(match.group(1))
+    item_info = GetIDLTypeInfo(match.group(2))
+    return CompositeIDLTypeInfo(idl_type_name, collection_info, item_info)
   return _idl_type_registry.get(idl_type_name, IDLTypeInfo(idl_type_name))