Remove ParamInfo.dart_type field.

lib/html/scripts/systemhtml.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
 import os
@@ skipping 64 matching lines @@
     self.factory_provider_name = factory_provider_name
 
   def ConstructorInfo(self, interface_name):
     info = OperationInfo()
     info.overloads = None
     info.declared_name = interface_name
     info.name = interface_name
     info.constructor_name = self.name
     info.js_name = None
     info.type_name = interface_name
-    info.param_infos = map(lambda tXn: ParamInfo(tXn[1], None, tXn[0], 'null'),
+    info.param_infos = map(lambda tXn: ParamInfo(tXn[1], tXn[0], 'null'),
                            self.opt_params)
     return info
 
 _html_element_constructors = {
   'AnchorElement' :
     ElementConstructorInfo(tag='a', opt_params=[('DOMString', 'href')]),
   'AreaElement': 'area',
   'ButtonElement': 'button',
   'BRElement': 'br',
   'BaseElement': 'base',
@@ skipping 763 matching lines @@
       native_return_type = output_conversion.input_type
     else:
       return_type = self._NarrowInputType(info.type_name)
       native_return_type = return_type
 
     def InputType(type_name):
       conversion = self._InputConversion(type_name, info.declared_name)
       if conversion:
         return conversion.input_type
       else:
-        return self._NarrowInputType(type_name)
+        return self._NarrowInputType(type_name) if type_name else 'Dynamic'
 
     body = self._members_emitter.Emit(
         '\n'
         '  $MODIFIERS$TYPE $(HTML_NAME)($PARAMS) {\n'
         '$!BODY'
         '  }\n',
         MODIFIERS='static ' if info.IsStatic() else '',
         TYPE=return_type,
         HTML_NAME=html_name,
         PARAMS=info.ParametersImplementationDeclaration(InputType))
 
     parameter_names = [param_info.name for param_info in info.param_infos]
-    parameter_types = [InputType(param_info.dart_type)
+    parameter_types = [InputType(param_info.type_id)
                        for param_info in info.param_infos]
     operations = info.operations
 
     method_version = [0]
     temp_version = [0]
 
     def GenerateCall(operation, argument_count, checks):
       checks = filter(lambda e: e != 'true', checks)
       if checks:
         (stmts_emitter, call_emitter) = body.Emit(
@@ skipping 20 matching lines @@
               NAME=temp_name,
               CONVERT=conversion.function_name,
               ARG=parameter_names[position])
           arguments.append(temp_name)
           param_type = temp_type
           verified_type = temp_type  # verified by assignment in checked mode.
         else:
           arguments.append(parameter_names[position])
           param_type = self._NarrowInputType(arg.type.id)
           # Verified by argument checking on entry to the dispatcher.
-          verified_type = InputType(info.param_infos[position].dart_type)
+          verified_type = InputType(info.param_infos[position].type_id)
 
         # The native method does not need an argument type if we know the type.
         # But we do need the native methods to have correct function types, so
         # be conservative.
         if param_type == verified_type:
           if param_type in ['String', 'num', 'int', 'double', 'bool', 'Object']:
             param_type = 'Dynamic'
         target_parameters.append(
             '%s%s' % (TypeOrNothing(param_type), param_name))
 
@@ skipping 86 matching lines @@
     return _js_custom_members
 
   def _HasJavaScriptIndexingBehaviour(self):
     """Returns True if the native object has an indexer and length property."""
     (element_type, requires_indexer) = ListImplementationInfo(
         self._interface, self._database)
     if element_type and requires_indexer: return True
     return False
 
   def _NarrowToImplementationType(self, type_name):
-    if type_name == 'Dynamic':
-      return type_name
     return self._type_registry.TypeInfo(type_name).narrow_dart_type()
 
   def _NarrowInputType(self, type_name):
     return self._NarrowToImplementationType(type_name)
 
   def _NarrowOutputType(self, type_name):
     secure_name = SecureOutputType(self, type_name, True)
     return self._NarrowToImplementationType(secure_name)
 
   def _FindShadowedAttribute(self, attr):
@@ skipping 60 matching lines @@
 
     library_emitter = self._multiemitter.FileEmitter(library_file_path)
     library_file_dir = os.path.dirname(library_file_path)
     auxiliary_dir = os.path.relpath(auxiliary_dir, library_file_dir)
     imports_emitter = library_emitter.Emit(
         self._template, AUXILIARY_DIR=massage_path(auxiliary_dir))
     for path in sorted(self._path_to_emitter.keys()):
       relpath = os.path.relpath(path, library_file_dir)
       imports_emitter.Emit(
           "#source('$PATH');\n", PATH=massage_path(relpath))