Get rid of _idl_to_dart_type_conversions map.

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
 
-# IDL->Dart primitive types conversion.
-_idl_to_dart_type_conversions = {
-    'any': 'Object',
-    'any[]': 'List',
-    'custom': 'Dynamic',
-    'boolean': 'bool',
-    'DOMObject': 'Object',
-    'DOMString': 'String',
-    'DOMStringList': 'List<String>',
-    'DOMStringMap': 'Map<String, String>',
-    'DOMTimeStamp': 'int',
-    'Date': 'Date',
-    # Map to num to enable callers to pass in Dart int, rational
-    # types.  Our implementations will need to convert these to
-    # doubles or floats as needed.
-    'double': 'num',
-    'float': 'num',
-    'int': 'int',
-    # Map to extra precision - int is a bignum in Dart.
-    'long': 'int',
-    'long long': 'int',
-    'object': 'Object',
-    # Map to extra precision - int is a bignum in Dart.
-    'short': 'int',
-    'string': 'String',
-    'void': 'void',
-    'Array': 'List',
-    'sequence': 'List',
-    # 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': 'Dynamic',
-    # TODO(vsm): Automatically recognize types defined in src.
-    'TimeoutHandler': 'TimeoutHandler',
-    'RequestAnimationFrameCallback': 'RequestAnimationFrameCallback',
-
-    # 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': 'Object',
-    }
-
-_dart_to_idl_type_conversions = dict((v,k) for k, v in
-                                     _idl_to_dart_type_conversions.iteritems())
-
 _pure_interfaces = set([
     'ElementTimeControl',
     'ElementTraversal',
     'MediaQueryListListener',
     'NodeSelector',
     'SVGExternalResourcesRequired',
     'SVGFilterPrimitiveStandardAttributes',
     'SVGFitToViewBox',
     'SVGLangSpace',
     'SVGLocatable',
@@ skipping 91 matching lines @@
 dom_frog_native_bodies = {
     # Some JavaScript processors, especially tools like yuicompress and
     # JSCompiler, choke on 'this.continue'
     'IDBCursor.continueFunction':
       """
         if (key == null) return this['continue']();
         return this['continue'](key);
       """,
 }
 
-
-def ConvertPrimitiveType(type_name):
-  if type_name.startswith('unsigned '):
-    type_name = type_name[len('unsigned '):]
-
-  if type_name in _idl_to_dart_type_conversions:
-    # 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)
+  return isinstance(GetIDLTypeInfo(type_name), PrimitiveIDLTypeInfo)
 
 def MaybeListElementTypeName(type_name):
   """Returns the List element type T from string of form "List<T>", or None."""
   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
@@ skipping 447 matching lines @@
     '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>'),
+    'Map<String, String>': PrimitiveIDLTypeInfo('DOMStringMap', dart_type='Map<String, String>'),
     'DOMTimeStamp': PrimitiveIDLTypeInfo('DOMTimeStamp', dart_type='int'),
     '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>'),

[Anton Muhin, 2012/04/09 14:20:47]

hmm, we have it for both DOMStringMap and Map<String, String>, is it a good
idea?

[podivilov, 2012/04/09 14:45:53]

Please note that both are mapped to DOMStringMap. Dart types as idl registry
keys are used as a temporary fix for unwanted renames in fremontcutbuilder.

+    'sequence': PrimitiveIDLTypeInfo('sequence', dart_type='List'),
+    'void': PrimitiveIDLTypeInfo('void', dart_type='void'),
+
     'CSSRule': IDLTypeInfo('CSSRule', conversion_includes=['CSSImportRule']),
     '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),
     'IDBKey': IDLTypeInfo('IDBKey', has_dart_wrapper=False),
     'MediaQueryListListener': IDLTypeInfo('MediaQueryListListener', has_dart_wrapper=False),
     'OptionsObject': IDLTypeInfo('OptionsObject', has_dart_wrapper=False),
@@ skipping 20 matching lines @@
     '"SVGAnimatedPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGStaticListPropertyTearOff.h"',
     '"SVGAnimatedListPropertyTearOff.h"',
     '"SVGTransformListPropertyTearOff.h"',
     '"SVGPathSegListPropertyTearOff.h"',
 ]
 
 def GetIDLTypeInfo(idl_type_name):
   return _idl_type_registry.get(idl_type_name, IDLTypeInfo(idl_type_name))