Cleanup list-like interfaces generation.

lib/html/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 54 matching lines @@
     # console).
     'Console': "=(typeof console == 'undefined' ? {} : console)",
 
     # DOMWindow aliased with global scope.
     'DOMWindow': '@*DOMWindow',
 }
 
 def IsRegisteredType(type_name):
   return type_name in _idl_type_registry
 
-def ListImplementationInfo(interface, database):
-  """Returns a tuple (elment_type, requires_indexer).
-  If interface do not have to implement List, element_type is None.
-  Otherwise element_type is list element type and requires_indexer
-  is true iff this interface implementation must have indexer and
-  false otherwise.  False means that interface implementation
-  inherits indexer and may just reuse it."""
-  element_type = MaybeListElementType(interface)
-  if element_type:
-    return (element_type, True)
-
-  for parent in interface.parents:
-    if database.HasInterface(parent.type.id):
-      parent_interface = database.GetInterface(parent.type.id)
-      (element_type, _) = ListImplementationInfo(parent_interface, database)
-      if element_type:
-        return (element_type, False)
-
-  return (None, None)
-
-
-def MaybeListElementType(interface):
-  """Returns the List element type T, or None in interface does not implement
-  List<T>.
-  """
-  for parent in interface.parents:
-    match = re.match(r'sequence<(\w*)>$', parent.type.id)
-    if match:
-      return match.group(1)
-  return None
-
-def MaybeTypedArrayElementType(interface):
-  """Returns the typed array element type, or None in interface is not a
-  TypedArray.
-  """
-  # Typed arrays implement ArrayBufferView and List<T>.
-  for parent in interface.parents:
-    if parent.type.id == 'ArrayBufferView':
-      return MaybeListElementType(interface)
-  return None
-
-def MaybeTypedArrayElementTypeInHierarchy(interface, database):
-  """Returns the typed array element type, or None in interface is not a
-  TypedArray.  Checks the whole parent hierarchy.
-  """
-  element_type = MaybeTypedArrayElementType(interface)
-  if element_type:
-    return element_type
-  for parent in interface.parents:
-    if database.HasInterface(parent.type.id):
-      parent_interface = database.GetInterface(parent.type.id)
-      element_type = MaybeTypedArrayElementType(parent_interface)
-      if element_type:
-        return element_type
-
-  return None
-
 def MakeNativeSpec(javascript_binding_name):
   if javascript_binding_name in _dart2js_dom_custom_native_specs:
     return _dart2js_dom_custom_native_specs[javascript_binding_name]
   else:
     # Make the class 'hidden' so it is dynamically patched at runtime.  This
     # is useful for browser compat.
     return '*' + javascript_binding_name
 
 
 def MatchSourceFilter(thing):
@@ skipping 463 matching lines @@
 
   def implementation_name(self):
     raise NotImplementedError()
 
   def has_generated_interface(self):
     raise NotImplementedError()
 
   def list_item_type(self):
     raise NotImplementedError()
 
+  def is_typed_array(self):
+    raise NotImplementedError()
+
   def merged_interface(self):
     return None
 
   def merged_into(self):
     return None
 
   def native_type(self):
     return self._data.native_type or self._idl_type
 
   def bindings_class(self):
@@ skipping 114 matching lines @@
     if self.merged_into():
       implementation_name = '%s_Merged' % implementation_name
     return implementation_name
 
   def has_generated_interface(self):
     return not self._data.suppress_interface
 
   def list_item_type(self):
     return self._data.item_type
 
+  def is_typed_array(self):
+    return self._data.is_typed_array
+
   def merged_interface(self):
     # All constants, attributes, and operations of merged interface should be
     # added to this interface. Merged idl interface does not have corresponding
     # Dart generated interface, and all references to merged idl interface
     # (e.g. parameter types, return types, parent interfaces) should be replaced
     # with this interface. There are two important restrictions:
     # 1) Merged and target interfaces shouldn't have common members, otherwise
     # there would be duplicated declarations in generated Dart code.
     # 2) Merged interface should be direct child of target interface, so the
     # children of merged interface are not affected by the merge.
@@ skipping 137 matching lines @@
 
 
 class TypeData(object):
   def __init__(self, clazz, dart_type=None, native_type=None,
                merged_interface=None, merged_into=None,
                custom_to_dart=None, custom_to_native=None,
                conversion_includes=None,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute',
                requires_v8_scope=False,
-               item_type=None, suppress_interface=False):
+               item_type=None, suppress_interface=False, is_typed_array=False):
     self.clazz = clazz
     self.dart_type = dart_type
     self.native_type = native_type
     self.merged_interface = merged_interface
     self.merged_into = merged_into
     self.custom_to_dart = custom_to_dart
     self.custom_to_native = custom_to_native
     self.conversion_includes = conversion_includes
     self.webcore_getter_name = webcore_getter_name
     self.webcore_setter_name = webcore_setter_name
     self.requires_v8_scope = requires_v8_scope
     self.item_type = item_type
     self.suppress_interface = suppress_interface
+    self.is_typed_array = is_typed_array
+
+
+def TypedArrayTypeData(item_type):
+  return TypeData(clazz='Interface', item_type=item_type, is_typed_array=True)
 
 
 _idl_type_registry = {
     'boolean': TypeData(clazz='Primitive', dart_type='bool', native_type='bool',
                         webcore_getter_name='hasAttribute',
                         webcore_setter_name='setBooleanAttribute'),
     'byte': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'octet': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'short': TypeData(clazz='Primitive', dart_type='int', native_type='int'),
     'unsigned short': TypeData(clazz='Primitive', dart_type='int',
@@ skipping 99 matching lines @@
         item_type='SpeechRecognitionResult', suppress_interface=True),
     'SQLResultSetRowList': TypeData(clazz='Interface', item_type='Dictionary'),
     'StyleSheetList': TypeData(clazz='Interface',
         item_type='StyleSheet', suppress_interface=True),
     'TextTrackCueList': TypeData(clazz='Interface', item_type='TextTrackCue'),
     'TextTrackList': TypeData(clazz='Interface', item_type='TextTrack'),
     'TouchList': TypeData(clazz='Interface', item_type='Touch'),
     'WebKitAnimationList': TypeData(clazz='Interface',
         item_type='WebKitAnimation', suppress_interface=True),
 
-    'Float32Array': TypeData(clazz='Interface', item_type='double'),
-    'Float64Array': TypeData(clazz='Interface', item_type='double'),
-    'Int8Array': TypeData(clazz='Interface', item_type='int'),
-    'Int16Array': TypeData(clazz='Interface', item_type='int'),
-    'Int32Array': TypeData(clazz='Interface', item_type='int'),
-    'Uint8Array': TypeData(clazz='Interface', item_type='int'),
-    'Uint16Array': TypeData(clazz='Interface', item_type='int'),
-    'Uint32Array': TypeData(clazz='Interface', item_type='int'),
+    'Float32Array': TypedArrayTypeData('double'),
+    'Float64Array': TypedArrayTypeData('double'),
+    'Int8Array': TypedArrayTypeData('int'),
+    'Int16Array': TypedArrayTypeData('int'),
+    'Int32Array': TypedArrayTypeData('int'),
+    'Uint8Array': TypedArrayTypeData('int'),
+    'Uint16Array': TypedArrayTypeData('int'),
+    'Uint32Array': TypedArrayTypeData('int'),
 
     'SVGAngle': TypeData(clazz='SVGTearOff'),
     'SVGLength': TypeData(clazz='SVGTearOff'),
     'SVGLengthList': TypeData(clazz='SVGTearOff', item_type='SVGLength'),
     'SVGMatrix': TypeData(clazz='SVGTearOff'),
     'SVGNumber': TypeData(clazz='SVGTearOff', native_type='SVGPropertyTearOff<float>'),
     'SVGNumberList': TypeData(clazz='SVGTearOff', item_type='SVGNumber'),
     'SVGPathSegList': TypeData(clazz='SVGTearOff', item_type='SVGPathSeg',
         native_type='SVGPathSegListPropertyTearOff'),
     'SVGPoint': TypeData(clazz='SVGTearOff', native_type='SVGPropertyTearOff<FloatPoint>'),
@@ skipping 57 matching lines @@
       else:
         dart_interface_name = type_name
       return InterfaceIDLTypeInfo(type_name, type_data, dart_interface_name,
                                   self)
 
     if type_data.clazz == 'SVGTearOff':
       return SVGTearOffIDLTypeInfo(type_name, type_data, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)