Do not rename idl types to dart types at top level - this info is needed for native bindings genera…

client/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 164 matching lines @@
     # Primitive type conversion
     return _idl_to_dart_type_conversions[type_name]
   return None
 
 def IsPrimitiveType(type_name):
   return (ConvertPrimitiveType(type_name) is not None or
           type_name in _dart_to_idl_type_conversions)
 
 def MaybeListElementTypeName(type_name):
   """Returns the List element type T from string of form "List<T>", or None."""
-  match = re.match(r'List<(\w*)>$', type_name)
+  match = re.match(r'sequence<(\w*)>$', type_name)
   if match:
     return match.group(1)
   return None
 
 def MaybeListElementType(interface):
   """Returns the List element type T, or None in interface does not implement
   List<T>.
   """
   for parent in interface.parents:
     element_type = MaybeListElementTypeName(parent.type.id)
@@ skipping 22 matching lines @@
     # against dart:dom to load in a worker isolate.
     return '*' + javascript_binding_name
 
 
 def MatchSourceFilter(filter, thing):
   if not filter:
     return True
   else:
     return any(token in thing.annotations for token in filter)
 
+def DartType(idl_type_name):
+  match = re.match(r'sequence<(\w*)>$', idl_type_name)
+  if match:
+    return 'List<%s>' % GetIDLTypeInfoByName(match.group(1)).dart_type()
+  return GetIDLTypeInfoByName(idl_type_name).dart_type()
 
 # Given a list of overloaded arguments, render a dart argument.
 def _DartArg(args, interface):
   # Given a list of overloaded arguments, choose a suitable name.
   def OverloadedName(args):
     return '_OR_'.join(sorted(set(arg.id for arg in args)))
 
   # Given a list of overloaded arguments, choose a suitable type.
   def OverloadedType(args):
-    typeIds = sorted(set(arg.type.id for arg in args))
+    typeIds = sorted(set(DartType(arg.type.id) for arg in args))
     if len(typeIds) == 1:
       return typeIds[0]
     else:
       return TypeName(typeIds, interface)
 
   filtered = filter(None, args)
   optional = any(not arg or arg.is_optional for arg in args)
   type = OverloadedType(filtered)
   name = OverloadedName(filtered)
   if optional:
@@ skipping 11 matching lines @@
   # Zip together arguments from each overload by position, then convert
   # to a dart argument.
   args = map(lambda *args: _DartArg(args, interface),
              *(op.arguments for op in operations))
 
   info = OperationInfo()
   info.overloads = operations
   info.declared_name = operations[0].id
   info.name = operations[0].ext_attrs.get('DartName', info.declared_name)
   info.js_name = info.declared_name
-  info.type_name = operations[0].type.id   # TODO: widen.
+  info.type_name = DartType(operations[0].type.id)   # TODO: widen.
   info.arg_infos = args
   return info
 
 
 def AnalyzeConstructor(interface):
   """Returns an OperationInfo object for the constructor.
 
   Returns None if the interface has no Constructor.
   """
   def GetArgs(func_value):
@@ skipping 29 matching lines @@
   """Returns the info for the callback method if the interface smells like a
   callback.
   """
   if 'Callback' not in interface.ext_attrs: return None
   handlers = [op for op in interface.operations if op.id == 'handleEvent']
   if not handlers: return None
   if not (handlers == interface.operations): return None
   return AnalyzeOperation(interface, handlers)
 
 def IsDartListType(type):
-  return type == 'List' or type.startswith('List<')
+  return type == 'List' or type.startswith('sequence<')
 
 def IsDartCollectionType(type):
   return IsDartListType(type)
 
 def FindMatchingAttribute(interface, attr1):
   matches = [attr2 for attr2 in interface.attributes
              if attr1.id == attr2.id
              and attr1.is_fc_getter == attr2.is_fc_getter
              and attr1.is_fc_setter == attr2.is_fc_setter]
   if matches:
@@ skipping 102 matching lines @@
 
 # Given a sorted sequence of type identifiers, return an appropriate type
 # name
 def TypeName(typeIds, interface):
   # Dynamically type this field for now.
   return 'var'
 
 # ------------------------------------------------------------------------------
 
 class IDLTypeInfo(object):
-  def __init__(self, idl_type, native_type=None, ref_counted=True,
+  def __init__(self, idl_type, dart_type=None, native_type=None, ref_counted=True,
                has_dart_wrapper=True, conversion_template=None,
                custom_to_dart=False):
     self._idl_type = idl_type
+    self._dart_type = dart_type
     self._native_type = native_type
     self._ref_counted = ref_counted
     self._has_dart_wrapper = has_dart_wrapper
     self._conversion_template = conversion_template
     self._custom_to_dart = custom_to_dart
 
   def idl_type(self):
     return self._idl_type
 
+  def dart_type(self):
+    if self._dart_type:
+      return self._dart_type
+    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:
       native_type = 'RefPtr< %s >' % native_type
     if self._has_dart_wrapper:
@@ skipping 20 matching lines @@
 
   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 PrimitiveIDLTypeInfo(IDLTypeInfo):
-  def __init__(self, idl_type, native_type=None, ref_counted=False,
+  def __init__(self, idl_type, dart_type, native_type=None, ref_counted=False,
                conversion_template=None,
                webcore_getter_name='getAttribute',
                webcore_setter_name='setAttribute'):
-    super(PrimitiveIDLTypeInfo, self).__init__(idl_type,
+    super(PrimitiveIDLTypeInfo, self).__init__(idl_type, dart_type=dart_type,
         native_type=native_type, ref_counted=ref_counted,
         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)
@@ skipping 26 matching lines @@
       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().'
 
 
 _idl_type_registry = {
-     # There is GC3Dboolean which is not a bool, but unsigned char for OpenGL compatibility.
-    'boolean': PrimitiveIDLTypeInfo('boolean', native_type='bool',
+    # There is GC3Dboolean which is not a bool, but unsigned char for OpenGL compatibility.
+    'boolean': PrimitiveIDLTypeInfo('boolean', dart_type='bool', native_type='bool',
                                     conversion_template='static_cast<bool>(%s)',
                                     webcore_getter_name='hasAttribute',
                                     webcore_setter_name='setBooleanAttribute'),
     # Some IDL's unsigned shorts/shorts are mapped to WebCore C++ enums, so we
     # use a static_cast<int> here not to provide overloads for all enums.
-    'short': PrimitiveIDLTypeInfo('short', native_type='int', conversion_template='static_cast<int>(%s)'),
-    'unsigned short': PrimitiveIDLTypeInfo('unsigned short', native_type='int', conversion_template='static_cast<int>(%s)'),
-    'int': PrimitiveIDLTypeInfo('int'),
-    'unsigned int': PrimitiveIDLTypeInfo('unsigned int', native_type='unsigned'),
-    'long': PrimitiveIDLTypeInfo('long', native_type='int',
+    'short': PrimitiveIDLTypeInfo('short', dart_type='int', native_type='int',
+        conversion_template='static_cast<int>(%s)'),
+    'unsigned short': PrimitiveIDLTypeInfo('unsigned short', dart_type='int',
+        native_type='int', conversion_template='static_cast<int>(%s)'),
+    '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', native_type='unsigned',
+    'unsigned long': PrimitiveIDLTypeInfo('unsigned long', dart_type='int',
+        native_type='unsigned',
         webcore_getter_name='getUnsignedIntegralAttribute',
         webcore_setter_name='setUnsignedIntegralAttribute'),
-    'long long': PrimitiveIDLTypeInfo('long long'),
-    'unsigned long long': PrimitiveIDLTypeInfo('unsigned long long'),
-    'double': PrimitiveIDLTypeInfo('double'),
+    'long long': PrimitiveIDLTypeInfo('long long', dart_type='int'),
+    'unsigned long long': PrimitiveIDLTypeInfo('unsigned long long', dart_type='int'),
+    'double': PrimitiveIDLTypeInfo('double', dart_type='num'),
+    'float': PrimitiveIDLTypeInfo('float', dart_type='num'),
 
-    'Date': PrimitiveIDLTypeInfo('Date',  native_type='double'),
-    'DOMString': PrimitiveIDLTypeInfo('DOMString',  native_type='String'),
-    'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp'),
-    'object': PrimitiveIDLTypeInfo('object',  native_type='ScriptValue'),
-    'SerializedScriptValue': PrimitiveIDLTypeInfo('SerializedScriptValue', ref_counted=True),
+    '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'),
+    'DOMString': PrimitiveIDLTypeInfo('DOMString', dart_type='String', native_type='String'),
+    # 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'),
+    'List<String>': PrimitiveIDLTypeInfo('DOMStringList', dart_type='List<String>'),
+    'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp', dart_type='int'),
+    'object': PrimitiveIDLTypeInfo('object', dart_type='Object', native_type='ScriptValue'),
+    'SerializedScriptValue': PrimitiveIDLTypeInfo('SerializedScriptValue', dart_type='Dynamic', ref_counted=True),
+    'WebKitFlags': PrimitiveIDLTypeInfo('WebKitFlags', dart_type='Object'),
 
-    'DOMException': IDLTypeInfo('DOMCoreException'),
+    'DOMException': IDLTypeInfo('DOMCoreException', dart_type='DOMException'),
     '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),
     'MediaQueryListListener': IDLTypeInfo('MediaQueryListListener', has_dart_wrapper=False),
     'OptionsObject': IDLTypeInfo('OptionsObject', has_dart_wrapper=False),
     '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>'),
     'SVGNumberList': SVGTearOffIDLTypeInfo('SVGNumberList', ref_counted=False),
     'SVGPathSegList': SVGTearOffIDLTypeInfo('SVGPathSegList', native_type='SVGPathSegListPropertyTearOff', ref_counted=False),
     'SVGPoint': SVGTearOffIDLTypeInfo('SVGPoint', native_type='SVGPropertyTearOff<FloatPoint>'),
     'SVGPointList': SVGTearOffIDLTypeInfo('SVGPointList', ref_counted=False),
     'SVGPreserveAspectRatio': SVGTearOffIDLTypeInfo('SVGPreserveAspectRatio'),
     'SVGRect': SVGTearOffIDLTypeInfo('SVGRect', native_type='SVGPropertyTearOff<FloatRect>'),
     'SVGStringList': SVGTearOffIDLTypeInfo('SVGStringList', native_type='SVGStaticListPropertyTearOff<SVGStringList>', ref_counted=False),
     'SVGTransform': SVGTearOffIDLTypeInfo('SVGTransform'),
     'SVGTransformList': SVGTearOffIDLTypeInfo('SVGTransformList', native_type='SVGTransformListPropertyTearOff', ref_counted=False)
 }
 
-original_idl_types = {
-}
-
 def GetIDLTypeInfo(idl_type):
-  idl_type_name = original_idl_types.get(idl_type, idl_type.id)
-  return GetIDLTypeInfoByName(idl_type_name)
+  return GetIDLTypeInfoByName(idl_type.id)
 
 def GetIDLTypeInfoByName(idl_type_name):
   return _idl_type_registry.get(idl_type_name, IDLTypeInfo(idl_type_name))