Merge 38 changes to bleeding edge

tools/dom/scripts/dartgenerator.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 generates Dart APIs from the IDL database."""
 
 import emitter
 import idlnode
 import logging
@@ skipping 10 matching lines @@
     if not node.has_attribute(attribute):
       node.attributes.append(attribute)
 
   node.constants.extend(other.constants)
 
 class DartGenerator(object):
   """Utilities to generate Dart APIs and corresponding JavaScript."""
 
   def __init__(self, logging_level=logging.WARNING):
     self._auxiliary_files = {}
-    self._dart_templates_re = re.compile(r'[\w.:]+<([\w\.<>:]+)>')
+    self._dart_templates_re = re.compile(r'[\w.:]+<([\w \.<>:]+)>')
     _logger.setLevel(logging_level)
 
   def _StripModules(self, type_name):
     return type_name.split('::')[-1]
 
   def _IsCompoundType(self, database, type_name):
     if IsRegisteredType(type_name):
       return True
 
     if type_name.endswith('?'):
@@ skipping 180 matching lines @@
         # Create fake EventTarget parent interface for interfaces that have
         # 'EventTarget' extended attribute.
         ast = [('Annotation', [('Id', 'WebKit')]),
                ('InterfaceType', ('ScopedName', 'EventTarget'))]
         interface.parents.append(idlnode.IDLParentInterface(ast))
 
   def AddMissingArguments(self, database):
     ARG = idlnode.IDLArgument([('Type', ('ScopedName', 'object')), ('Id', 'arg')])
     for interface in database.GetInterfaces():
       for operation in interface.operations:
-        call_with = (operation.ext_attrs.get('CallWith', '').split('|') +
-                     operation.ext_attrs.get('ConstructorCallWith', '').split('|') +
-                     operation.ext_attrs.get('CallWith', '').split('&') +
-                     operation.ext_attrs.get('ConstructorCallWith', '').split('&'))
+        call_with = (operation.ext_attrs.get('CallWith', '') +
+                     operation.ext_attrs.get('ConstructorCallWith', ''))
         if 'ScriptArguments' in call_with:
           operation.arguments.append(ARG)