Expand overloaded methods and optional parameters in the html library.

tools/dom/scripts/htmldartgenerator.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 the system to generate
 dart:html APIs from the IDL database."""
 
 import emitter
 from generator import AnalyzeOperation, ConstantOutputOrder, \
     DartDomNameOfAttribute, FindMatchingAttribute, IsDartCollectionType, \
     IsPureInterface, TypeOrNothing, ConvertToFuture, GetCallbackInfo
-from htmlrenamer import convert_to_future_members
+from copy import deepcopy
+from htmlrenamer import convert_to_future_members, keep_overloaded_members, \
+    private_html_members, renamed_html_members, renamed_overloads
+import monitored
 
 # Types that are accessible cross-frame in a limited fashion.
 # In these cases, the base type (e.g., WindowBase) provides restricted access
 # while the subtype (e.g., Window) provides full access to the
 # corresponding objects if there are from the same frame.
 _secure_base_types = {
   'Window': 'WindowBase',
   'Location': 'LocationBase',
   'History': 'HistoryBase',
 }
@@ skipping 52 matching lines @@
     else:
       for parent in self._database.Hierarchy(self._interface):
         if parent == self._interface:
           continue
         parent_type_info = self._type_registry.TypeInfo(parent.id)
         if parent_type_info.list_item_type():
           self.AmendIndexer(parent_type_info.list_item_type())
           break
 
     # Group overloaded operations by name.
+    self._AddRenamedOverloads(interface)
     operationsByName = self._OperationsByName(interface)
 
     # Generate operations.
     for id in sorted(operationsByName.keys()):
       operations = operationsByName[id]
       info = AnalyzeOperation(interface, operations)
       self.AddOperation(info, declare_only)
       if ('%s.%s' % (interface.id, info.declared_name) in
           convert_to_future_members):
         self.AddOperation(ConvertToFuture(info), declare_only)
@@ skipping 16 matching lines @@
       operationsByName =self._OperationsByName(parent_interface)
 
       # Generate operations.
       for id in sorted(operationsByName.keys()):
         if not any(op.id == id for op in interface.operations):
           operations = operationsByName[id]
           info = AnalyzeOperation(interface, operations)
           self.SecondaryContext(parent_interface)
           self.AddOperation(info)
 
+  def _AddRenamedOverloads(self, interface):
+    """The IDL has a number of functions with the same name but that accept
+    different types. This is fine for JavaScript, but results in vague type
+    signatures for Dart. We rename some of these (by adding a new identical
+    operation with a different DartName), but leave the original version as
+    well."""
+    # This function gets called twice per interface if we generate both dart2js
+    # and dartium APIs, but we only want to rename the overloads once, so we
+    # keep track of this via already_renamed.
+    already_renamed = [operation.ext_attrs['DartName'] if 'DartName' in
+        operation.ext_attrs else '' for operation in interface.operations]
+    added_operations = []
+    operations_by_name = self._OperationsByName(interface)
+    for operation in interface.operations:
+      full_operation_str = self._GetStringRepresentation(interface, operation)
+      if (full_operation_str in renamed_overloads and
+          renamed_overloads[full_operation_str] not in already_renamed):
+        cloned_operation = deepcopy(operation)
+        cloned_operation.ext_attrs['DartName'] = renamed_overloads[
+            full_operation_str]
+        added_operations.append(cloned_operation)
+      operation_str = '%s.%s' % (interface.id, operation.id)
+      if (operation.id in operations_by_name and
+          len(operations_by_name[operation.id]) > 1 and
+          len(filter(lambda overload: overload.startswith(operation_str),
+              renamed_overloads.keys())) == 0 and
+          operation_str not in keep_overloaded_members and
+          operation_str not in renamed_html_members and
+          operation_str not in private_html_members):
+        print 'WARNING: Multiple type signatures for %s.%s' % (

[blois, 2013/06/28 20:57:48]

This should use the logging mechanism.

+            interface.id, operation.id)
+    interface.operations += added_operations
+
+  def _GetStringRepresentation(self, interface, operation):
+    """Given an IDLOperation, return a object-independent representation of the
+    operations's signature."""
+    return '%s.%s(%s)' % (interface.id, operation.id, ', '.join(
+        ['%s %s' % (arg.type.id, arg.id) for arg in operation.arguments]))
+
   def _OperationsByName(self, interface):
     operationsByName = {}
     for operation in interface.operations:
       name = operation.ext_attrs.get('DartName', operation.id)
       operationsByName.setdefault(name, []).append(operation)
     return operationsByName
 
   def AddConstant(self, constant):
     const_name = self._renamer.RenameMember(
         self._interface.id, constant, constant.id, 'get:', dartify_name=False)
@@ skipping 453 matching lines @@
     if interface.parents:
       parent = interface.parents[0]
       if IsPureInterface(parent.type.id):
         walk(interface.parents)
       else:
         walk(interface.parents[1:])
     return result
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)