Map IDBAny and IDBKey to Dynamic

lib/dom/scripts/systeminterface.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 providesfunctionality for systems to generate
 Dart interfaces from the IDL database."""
 
 import os
 import systembase
@@ skipping 157 matching lines @@
           BASE=self._super_interface)
       for const in sorted(self._interface.constants, ConstantOutputOrder):
         self._EmitConstant(consts_emitter, const)
 
   def AddConstant(self, constant):
     if (not self._super_interface or
         self._interface.id is self._super_interface):
       self._EmitConstant(self._members_emitter, constant)
 
   def _EmitConstant(self, emitter, constant):
-    emitter.Emit('\n  static final $TYPE $NAME = $VALUE;\n',
+    emitter.Emit('\n  static final $TYPE$NAME = $VALUE;\n',
                  NAME=constant.id,
-                 TYPE=DartType(constant.type.id),
+                 TYPE=TypeOrNothing(DartType(constant.type.id),
+                                    constant.type.id),
                  VALUE=constant.value)
 
   def AddAttribute(self, getter, setter):
     if getter and setter and getter.type.id == setter.type.id:
       self._members_emitter.Emit('\n  $TYPE $NAME;\n',
                                  NAME=DartDomNameOfAttribute(getter),
-                                 TYPE=DartType(getter.type.id));
+                                 TYPE=TypeOrVar(DartType(getter.type.id),
+                                                getter.type.id))
       return
     if getter and not setter:
-      self._members_emitter.Emit('\n  final $TYPE $NAME;\n',
+      self._members_emitter.Emit('\n  final $TYPE$NAME;\n',
                                  NAME=DartDomNameOfAttribute(getter),
-                                 TYPE=DartType(getter.type.id));
+                                 TYPE=TypeOrNothing(DartType(getter.type.id),
+                                                    getter.type.id))
       return
     raise Exception('Unexpected getter/setter combination %s %s' %
                     (getter, setter))
 
   def AddIndexer(self, element_type):
     # Interface inherits all operations from List<element_type>.
     pass
 
   def AddOperation(self, info):
     """
     Arguments:
       operations - contains the overloads, one or more operations with the same
         name.
     """
     self._members_emitter.Emit('\n'
                                '  $TYPE $NAME($PARAMS);\n',
                                TYPE=info.type_name,
                                NAME=info.name,
                                PARAMS=info.ParametersInterfaceDeclaration())
 
   # Interfaces get secondary members directly via the superinterfaces.
   def AddSecondaryAttribute(self, interface, getter, setter):
     pass
 
   def AddSecondaryOperation(self, interface, attr):
     pass