Do not rename idl types to dart types at top level - this info is needed for native bindings genera…

client/dom/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 os
 from generator import *
@@ skipping 494 matching lines @@
   def StartInterface(self):
     typename = self._interface.id
 
     extends = []
     suppressed_extends = []
 
     for parent in self._interface.parents:
       # TODO(vsm): Remove source_filter.
       if MatchSourceFilter(self._source_filter, parent):
         # Parent is a DOM type.
-        extends.append(parent.type.id)
+        extends.append(DartType(parent.type.id))
       elif '<' in parent.type.id:
         # Parent is a Dart collection type.
         # TODO(vsm): Make this check more robust.
         extends.append(parent.type.id)
       else:
         suppressed_extends.append('%s.%s' %
                                   (self._common_prefix, parent.type.id))
 
     comment = ' extends'
     extends_str = ''
@@ skipping 16 matching lines @@
     element_type = MaybeTypedArrayElementType(self._interface)
     if element_type:
       self._members_emitter.Emit(
           '\n'
           '  $CTOR(int length);\n'
           '\n'
           '  $CTOR.fromList(List<$TYPE> list);\n'
           '\n'
           '  $CTOR.fromBuffer(ArrayBuffer buffer);\n',
         CTOR=self._interface.id,
-        TYPE=element_type)
+        TYPE=DartType(element_type))
 
   def AddAttribute(self, getter, setter):
     if getter and not self._system._AllowInHtmlLibrary(self._interface,
         'get:' + getter.id):
       getter = None
     if setter and not self._system._AllowInHtmlLibrary(self._interface,
         'set:' + setter.id):
       setter = None
     if not getter and not setter:
       return
-    if getter and setter and getter.type.id == setter.type.id:
+    if getter and setter and DartType(getter.type.id) == DartType(setter.type.id):
       self._members_emitter.Emit('\n  $TYPE $NAME;\n',
-                                 NAME=getter.id, TYPE=getter.type.id);
+                                 NAME=getter.id, TYPE=DartType(getter.type.id));
       return
     if getter and not setter:
       self._members_emitter.Emit('\n  final $TYPE $NAME;\n',
-                                 NAME=getter.id, TYPE=getter.type.id);
+                                 NAME=getter.id, TYPE=DartType(getter.type.id));
       return
     raise Exception('Unexpected getter/setter combination %s %s' %
                     (getter, setter))
 
   def AddOperation(self, info):
     """
     Arguments:
       operations - contains the overloads, one or more operations with the same
         name.
     """
@@ skipping 74 matching lines @@
         base = self._ImplClassName(supertype)
 
     native_spec = MakeNativeSpec(interface.javascript_binding_name)
 
     extends = ' extends ' + base if base else ''
 
     # TODO: Include all implemented interfaces, including other Lists.
     implements = [interface_name]
     element_type = MaybeTypedArrayElementType(self._interface)
     if element_type:
-      implements.append('List<' + element_type + '>')
+      implements.append('List<%s>' % DartType(element_type))
 
     self._members_emitter = self._dart_code.Emit(
         self._template,
         #class $CLASSNAME$EXTENDS$IMPLEMENTS$NATIVESPEC {
         #$!MEMBERS
         #}
         CLASSNAME=self._class_name,
         EXTENDS=extends,
         IMPLEMENTS=' implements ' + ', '.join(implements),
         NATIVESPEC=' native "' + native_spec + '"')
@@ skipping 358 matching lines @@
     #   class YImpl extends ListBase<T> { copies of transitive XImpl methods; }
     #
     if self._HasNativeIndexGetter(self._interface):
       self._EmitNativeIndexGetter(self._interface, element_type)
     else:
       self._members_emitter.Emit(
           '\n'
           '  $TYPE operator[](int index) {\n'
           '    return item(index);\n'
           '  }\n',
-          TYPE=element_type)
+          TYPE=DartType(element_type))
 
     if self._HasNativeIndexSetter(self._interface):
       self._EmitNativeIndexSetter(self._interface, element_type)
     else:
       self._members_emitter.Emit(
           '\n'
           '  void operator[]=(int index, $TYPE value) {\n'
           '    throw new UnsupportedOperationException("Cannot assign element of immutable List.");\n'
           '  }\n',
           TYPE=element_type)
@@ skipping 272 matching lines @@
     # dispatch has removed f(X), leaving only f(Y), but there is no guarantee
     # that Y = Z-X, so we need to check for Y.
     true_code = emitter.Emit(
         '$(INDENT)if ($COND) {\n'
         '$!TRUE'
         '$(INDENT)}\n',
         COND=test, INDENT=indent)
     self.GenerateDispatch(
         true_code, info, indent + '  ', position + 1, positive)
     return True