Move to new dart:typeddata types for dart2js

tools/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 json
 import monitored
 import os
 import re
-from htmlrenamer import html_interface_renames, renamed_html_members
+from htmlrenamer import html_interface_renames, renamed_html_members, \
+     typed_array_renames
 
 # Set up json file for retrieving comments.
 _current_dir = os.path.dirname(__file__)
 _json_path = os.path.join(_current_dir, '..', 'docs', 'docs.json')
 _dom_json = json.load(open(_json_path))
 
 _pure_interfaces = monitored.Set('generator._pure_interfaces', [
     # TODO(sra): DOMStringMap should be a class implementing Map<String,String>.
     'DOMStringMap',
     'ElementTimeControl',
     'ElementTraversal',
     'EventListener',
     'MediaQueryListListener',
     'MutationCallback',
     'SVGExternalResourcesRequired',
     'SVGFilterPrimitiveStandardAttributes',
     'SVGFitToViewBox',
     'SVGLangSpace',
     'SVGLocatable',
     'SVGTests',
     'SVGTransformable',
     'SVGURIReference',
     'SVGZoomAndPan',
-    'TimeoutHandler'])
+    'TimeoutHandler',
+    ])
 
 def IsPureInterface(interface_name):
   return interface_name in _pure_interfaces
 
+_custom_types = monitored.Set('generator._custom_types',
+                              typed_array_renames.keys())
+
+def IsCustomType(interface_name):
+  return interface_name in _custom_types
 
 _methods_with_named_formals = monitored.Set(
     'generator._methods_with_named_formals', [
-  'DataView.getFloat32',
-  'DataView.getFloat64',
-  'DataView.getInt16',
-  'DataView.getInt32',
-  'DataView.getInt8',
-  'DataView.getUint16',
-  'DataView.getUint32',
-  'DataView.getUint8',
-  'DataView.setFloat32',
-  'DataView.setFloat64',
-  'DataView.setInt16',
-  'DataView.setInt32',
-  'DataView.setInt8',
-  'DataView.setUint16',
-  'DataView.setUint32',
-  'DataView.setUint8',
   'DirectoryEntry.getDirectory',
   'DirectoryEntry.getFile',
   'Entry.copyTo',
   'Entry.moveTo',
   'HTMLInputElement.setRangeText',
   'XMLHttpRequest.open',
   ])
 
 #
 # Renames for attributes that have names that are not legal Dart names.
 #
 _dart_attribute_renames = monitored.Dict('generator._dart_attribute_renames', {
     'default': 'defaultValue',
 })
 
 #
 # Interface version of the DOM needs to delegate typed array constructors to a
 # factory provider.
 #
 interface_factories = monitored.Dict('generator.interface_factories', {
-    'Float32Array': '_TypedArrayFactoryProvider',
-    'Float64Array': '_TypedArrayFactoryProvider',
-    'Int8Array': '_TypedArrayFactoryProvider',
-    'Int16Array': '_TypedArrayFactoryProvider',
-    'Int32Array': '_TypedArrayFactoryProvider',
-    'Uint8Array': '_TypedArrayFactoryProvider',
-    'Uint8ClampedArray': '_TypedArrayFactoryProvider',
-    'Uint16Array': '_TypedArrayFactoryProvider',
-    'Uint32Array': '_TypedArrayFactoryProvider',
 })
 
 #
 # Custom native specs for the dart2js dom.
 #
 _dart2js_dom_custom_native_specs = monitored.Dict(
       'generator._dart2js_dom_custom_native_specs', {
     # Decorate the singleton Console object, if present (workers do not have a
     # console).
     'Console': "=(typeof console == 'undefined' ? {} : console)",
@@ skipping 289 matching lines @@
   def _ConstructorFullName(self, rename_type):
     if self.constructor_name:
       return rename_type(self.type_name) + '.' + self.constructor_name
     else:
       # TODO(antonm): temporary ugly hack.
       # While in transition phase we allow both DOM's ArrayBuffer
       # and dart:typeddata's ByteBuffer for IDLs' ArrayBuffers,
       # hence ArrayBuffer is mapped to dynamic in arguments and return
       # values.  To compensate for that when generating ArrayBuffer itself,
       # we need to lie a bit:
-      if self.type_name == 'ArrayBuffer': return 'ArrayBuffer'
+      if self.type_name == 'ArrayBuffer': return 'ByteBuffer'
       return rename_type(self.type_name)
 
 def ConstantOutputOrder(a, b):
   """Canonical output ordering for constants."""
   return cmp(a.id, b.id)
 
 
 def _FormatNameList(names):
   """Returns JavaScript array literal expression with one name per line."""
   #names = sorted(names)
@@ skipping 134 matching lines @@
 # used to assemble the annotations:
 #
 #   INTERFACE.MEMBER: annotations for member.
 #   +TYPE:            add annotations only if there are member annotations.
 #   -TYPE:            add annotations only if there are no member annotations.
 #   TYPE:             add regardless of member annotations.
 
 dart2js_annotations = monitored.Dict('generator.dart2js_annotations', {
 
     'ArrayBuffer': [
-      "@Creates('ArrayBuffer')",
-      "@Returns('ArrayBuffer|Null')",
+      "@Creates('ByteBuffer')",
+      "@Returns('ByteBuffer|Null')",
     ],
 
     'ArrayBufferView': [
-      "@Creates('ArrayBufferView')",
-      "@Returns('ArrayBufferView|Null')",
+      "@Creates('TypedData')",
+      "@Returns('TypedData|Null')",
     ],
 
     'CanvasRenderingContext2D.createImageData': [
       "@Creates('ImageData|=Object')",
     ],
 
     'CanvasRenderingContext2D.getImageData': [
       "@Creates('ImageData|=Object')",
     ],
 
@@ skipping 39 matching lines @@
       "@Creates('Node')",
       "@Returns('EventTarget|=Object')",
     ],
 
     # Touch targets are Elements in a Document, or the Document.
     'Touch.target': [
       "@Creates('Element|Document')",
       "@Returns('Element|Document')",
     ],
 
-    'FileReader.result': ["@Creates('String|ArrayBuffer|Null')"],
+    'FileReader.result': ["@Creates('String|ByteBuffer|Null')"],
 
     # Rather than have the result of an IDBRequest as a union over all possible
     # results, we mark the result as instantiating any classes, and mark
     # each operation with the classes that it could cause to be asynchronously
     # instantiated.
     'IDBRequest.result': ["@Creates('Null')"],
 
     # The source is usually a participant in the operation that generated the
     # IDBRequest.
     'IDBRequest.source':  ["@Creates('Null')"],
@@ skipping 48 matching lines @@
     'SerializedScriptValue': [
       "@annotation_Creates_SerializedScriptValue",
       "@annotation_Returns_SerializedScriptValue",
     ],
 
     'SQLResultSetRowList.item': ["@Creates('=Object')"],
 
     'WebGLRenderingContext.getParameter': [
       # Taken from http://www.khronos.org/registry/webgl/specs/latest/
       # Section 5.14.3 Setting and getting state
-      "@Creates('Null|num|String|bool|=List|Float32Array|Int32Array|Uint32Array"
+      "@Creates('Null|num|String|bool|=List|Float32List|Int32List|Uint32List"
                 "|Framebuffer|Renderbuffer|Texture')",
-      "@Returns('Null|num|String|bool|=List|Float32Array|Int32Array|Uint32Array"
+      "@Returns('Null|num|String|bool|=List|Float32List|Int32List|Uint32List"
                 "|Framebuffer|Renderbuffer|Texture')",
     ],
 
     'XMLHttpRequest.response': [
-      "@Creates('ArrayBuffer|Blob|Document|=Object|=List|String|num')",
+      "@Creates('ByteBuffer|Blob|Document|=Object|=List|String|num')",
     ],
 }, dart2jsOnly=True)
 
 _indexed_db_annotations = [
   "@SupportedBrowser(SupportedBrowser.CHROME)",
   "@SupportedBrowser(SupportedBrowser.FIREFOX, '15')",
   "@SupportedBrowser(SupportedBrowser.IE, '10')",
   "@Experimental",
 ]
 
@@ skipping 756 matching lines @@
 
     'Float32Array': TypedArrayTypeData('double'),
     'Float64Array': TypedArrayTypeData('double'),
     'Int8Array': TypedArrayTypeData('int'),
     'Int16Array': TypedArrayTypeData('int'),
     'Int32Array': TypedArrayTypeData('int'),
     'Uint8Array': TypedArrayTypeData('int'),
     'Uint8ClampedArray': TypedArrayTypeData('int'),
     'Uint16Array': TypedArrayTypeData('int'),
     'Uint32Array': TypedArrayTypeData('int'),
-    # TODO(antonm): temporary ugly hack.
-    # While in transition phase we allow both DOM's ArrayBuffer
-    # and dart:typeddata's ByteBuffer for IDLs' ArrayBuffers,
-    # hence ArrayBuffer is mapped to dynamic in arguments and return
-    # values.
-    'ArrayBufferView': TypeData(clazz='Interface', dart_type='dynamic',
+    'ArrayBufferView': TypeData(clazz='Interface',
         custom_to_native=True, custom_to_dart=True),
-    'ArrayBuffer': TypeData(clazz='Interface', dart_type='dynamic',
+    'ArrayBuffer': TypeData(clazz='Interface',
         custom_to_native=True, custom_to_dart=True),
 
     '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'),
@@ skipping 67 matching lines @@
                                   self)
 
     if type_data.clazz == 'SVGTearOff':
       dart_interface_name = self._renamer.RenameInterface(
           self._database.GetInterface(type_name))
       return SVGTearOffIDLTypeInfo(
           type_name, type_data, dart_interface_name, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)