Remove global DartType function.

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 123 matching lines @@
   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):
   return 'WebKit' in thing.annotations or 'Dart' in thing.annotations
 
 
-def DartType(idl_type_name):
-  if idl_type_name in _idl_type_registry:
-    return _idl_type_registry[idl_type_name].dart_type or idl_type_name
-  return idl_type_name
-
-
 class ParamInfo(object):
   """Holder for various information about a parameter of a Dart operation.
 
   Attributes:
     name: Name of parameter.
     type_id: Original type id.  None for merged types.
     dart_type: DartType of parameter.
     is_optional: Parameter optionality.
   """
   def __init__(self, name, type_id, dart_type, is_optional):
@@ skipping 20 matching lines @@
     if constructor:
       # FIXME: Constructors with 'Optional=XXX' shouldn't be treated as
       # optional arguments.
       return 'Optional' in argument.ext_attrs
     return False
 
   # Given a list of overloaded arguments, choose a suitable name.
   def OverloadedName(args):
     return '_OR_'.join(sorted(set(arg.id for arg in args)))
 
+  def DartType(idl_type_name):
+   if idl_type_name in _idl_type_registry:
+     return _idl_type_registry[idl_type_name].dart_type or idl_type_name
+   return idl_type_name
+
   # Given a list of overloaded arguments, choose a suitable type.
   def OverloadedType(args):
     type_ids = sorted(set(arg.type.id for arg in args))
-    dart_types = sorted(set(DartType(arg.type.id) for arg in args))
-    if len(dart_types) == 1:
+    if len(set(DartType(arg.type.id) for arg in args)) == 1:
       if len(type_ids) == 1:
         return (type_ids[0], type_ids[0])
       else:
         return (None, type_ids[0])
     else:
       return (None, TypeName(type_ids, interface))
 
   result = []
 
   is_optional = False
@@ skipping 779 matching lines @@
     if match:
       if type_name == 'DOMString[]':
         return DOMStringArrayTypeInfo(TypeData('Sequence'), self.TypeInfo('DOMString'))
       item_info = self.TypeInfo(match.group(1) or match.group(2))
       return SequenceIDLTypeInfo(type_name, TypeData('Sequence'), item_info)
     if not type_name in _idl_type_registry:
       return InterfaceIDLTypeInfo(type_name, TypeData('Interface'))
     type_data = _idl_type_registry.get(type_name)
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)