Merge 38 changes to bleeding edge

tools/dom/scripts/idlnode.py

 #!/usr/bin/python
 # Copyright (c) 2011, 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.
 
 import os
 import sys
 
 import idl_definitions
-from idl_types import IdlType, IdlUnionType
+from idl_types import IdlType, IdlUnionType, IdlArrayOrSequenceType
 
 from compute_interfaces_info_overall import interfaces_info
 
 
 new_asts = {}
 
 
 _operation_suffix_map = {
   '__getter__': "Getter",
   '__setter__': "Setter",
@@ skipping 519 matching lines @@
     elif isinstance(ast, tuple):
       (label, value) = ast
       if label == 'ScopedName':
         self.id = value
       else:
         self.id = self._label_to_type(label, ast)
     elif isinstance(ast, str):
       self.id = ast
     # New blink handling.
     elif ast.__module__ == "idl_types":
-      if isinstance(ast, IdlType):
+      if isinstance(ast, IdlType) or isinstance(ast, IdlArrayOrSequenceType):
         type_name = str(ast)
 
         # TODO(terry): For now don't handle unrestricted types see
         #              https://code.google.com/p/chromium/issues/detail?id=354298
         type_name = type_name.replace('unrestricted ', '', 1);
 
         # TODO(terry): Handled ScalarValueString as a DOMString.
         type_name = type_name.replace('ScalarValueString', 'DOMString', 1)
 
         self.id = type_name
       else:
         # IdlUnionType
-        assert ast.is_union_type
+        if ast.is_union_type:
+          print 'WARNING type %s is union mapped to \'any\'' % self.id
         # TODO(terry): For union types use any otherwise type is unionType is
         #              not found and is removed during merging.
         self.id = 'any'
         # TODO(terry): Any union type e.g. 'type1 or type2 or type2',
         #                            'typedef (Type1 or Type2) UnionType'
         # Is a problem we need to extend IDLType and IDLTypeDef to handle more
         # than one type.
         #
         # Also for typedef's e.g.,
         #                 typedef (Type1 or Type2) UnionType
@@ skipping 236 matching lines @@
   """IDLDictNode specialization for one annotation."""
   def __init__(self, ast=None):
     IDLDictNode.__init__(self, ast)
     self.id = None
     if not ast:
       return
     for arg in self._find_all(ast, 'AnnotationArg'):
       name = self._find_first(arg, 'Id')
       value = self._find_first(arg, 'AnnotationArgValue')
       self[name] = value