Map IDBAny and IDBKey to Dynamic

lib/dom/scripts/systemfrog.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 systems to generate
 frog binding from the IDL database."""
 
 import os
 from generator import *
@@ skipping 198 matching lines @@
     if super_getter or super_setter:
       if getter and not setter and super_getter and not super_setter:
         if DartType(getter.type.id) == DartType(super_getter.type.id):
           # Compatible getter, use the superclass property.  This works because
           # JavaScript will do its own dynamic dispatch.
           self._members_emitter.Emit(
               '\n'
               '  // Use implementation from $SUPER.\n'
               '  // final $TYPE $NAME;\n',
               SUPER=super_getter_interface.id,
-              NAME=DartDomNameOfAttribute(getter), TYPE=output_type)
+              NAME=DartDomNameOfAttribute(getter),
+              TYPE=output_type)
           return
 
       self._members_emitter.Emit('\n  // Shadowing definition.')
       self._AddAttributeUsingProperties(getter, setter)
       return
 
     # Can't generate field if attribute has different name in JS and Dart.
     if self._AttributeChangesName(getter or setter):
       self._AddAttributeUsingProperties(getter, setter)
       return
 
     if getter and setter and input_type == output_type:
       self._members_emitter.Emit(
           '\n  $TYPE $NAME;\n',
-          NAME=DartDomNameOfAttribute(getter), TYPE=output_type)
+          NAME=DartDomNameOfAttribute(getter),
+          TYPE=TypeOrVar(output_type))
       return
     if getter and not setter:
       self._members_emitter.Emit(
-          '\n  final $TYPE $NAME;\n',
-          NAME=DartDomNameOfAttribute(getter), TYPE=output_type)
+          '\n  final $OPT_TYPE$NAME;\n',
+          NAME=DartDomNameOfAttribute(getter),
+          OPT_TYPE=TypeOrNothing(output_type))
       return
     self._AddAttributeUsingProperties(getter, setter)
 
   def _AttributeChangesName(self, attr):
     return attr.id != DartDomNameOfAttribute(attr)
 
   def _AddAttributeUsingProperties(self, getter, setter):
     if getter:
       self._AddGetter(getter)
     if setter:
       self._AddSetter(setter)
 
   def _AddGetter(self, attr):
     # TODO(sra): Remove native body when Issue 829 fixed.
     self._members_emitter.Emit(
-        '\n  $TYPE get $NAME() native "return this.$NATIVE_NAME;";\n',
+        '\n  $(OPT_TYPE)get $NAME() native "return this.$NATIVE_NAME;";\n',
         NAME=DartDomNameOfAttribute(attr),
         NATIVE_NAME=attr.id,
-        TYPE=self._NarrowOutputType(attr.type.id))
+        OPT_TYPE=TypeOrNothing(self._NarrowOutputType(attr.type.id)))
 
   def _AddSetter(self, attr):
     # TODO(sra): Remove native body when Issue 829 fixed.
     self._members_emitter.Emit(
-        '  void set $NAME($TYPE value) native "this.$NATIVE_NAME = value;";\n',
+        '  void set $NAME($(OPT_TYPE)value)'
+            ' native "this.$NATIVE_NAME = value;";\n',
         NAME=DartDomNameOfAttribute(attr),
         NATIVE_NAME=attr.id,
-        TYPE=self._NarrowInputType(attr.type.id))
+        OPT_TYPE=TypeOrNothing(self._NarrowInputType(attr.type.id)))
 
   def _FindShadowedAttribute(self, attr):
     """Returns (attribute, superinterface) or (None, None)."""
     def FindInParent(interface):
       """Returns matching attribute in parent, or None."""
       if interface.parents:
         parent = interface.parents[0]
         if IsDartCollectionType(parent.type.id):
           return (None, None)
         if self._system._database.HasInterface(parent.type.id):
@@ skipping 82 matching lines @@
     if native_body:
       native_string = " '''" + native_body + "'''"
 
     self._members_emitter.Emit(
         '\n'
         '  $TYPE $NAME($PARAMS) native$NATIVESTRING;\n',
         TYPE=self._NarrowOutputType(info.type_name),
         NAME=info.name,
         PARAMS=params,
         NATIVESTRING=native_string)