Dartium Roll 38 roll

bindings/scripts/utilities.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions (file reading, simple IDL parsing by regexes) for IDL build.
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-build
 """
 
 import os
@@ skipping 101 matching lines @@
     return (
         [left for left, right in implements_pairs if right == interface_name],
         [right for left, right in implements_pairs if left == interface_name])
 
 
 def is_callback_interface_from_idl(file_contents):
     match = re.search(r'callback\s+interface\s+\w+\s*{', file_contents)
     return bool(match)
 
 
+def is_dictionary_from_idl(file_contents):
+    match = re.search(r'dictionary\s+\w+\s*{', file_contents)
+    return bool(match)
+
+
 def get_parent_interface(file_contents):
     match = re.search(r'interface\s+'
                       r'\w+\s*'
                       r':\s*(\w+)\s*'
                       r'{',
                       file_contents)
     return match and match.group(1)
 
 
 def get_interface_extended_attributes_from_idl(file_contents):
     # Strip comments
     # re.compile needed b/c Python 2.6 doesn't support flags in re.sub
     single_line_comment_re = re.compile(r'//.*$', flags=re.MULTILINE)
     block_comment_re = re.compile(r'/\*.*?\*/', flags=re.MULTILINE | re.DOTALL)
     file_contents = re.sub(single_line_comment_re, '', file_contents)
     file_contents = re.sub(block_comment_re, '', file_contents)
 
     match = re.search(r'\[(.*)\]\s*'
                       r'((callback|partial)\s+)?'
                       r'(interface|exception)\s+'
                       r'\w+\s*'
                       r'(:\s*\w+\s*)?'
                       r'{',
                       file_contents, flags=re.DOTALL)
     if not match:
         return {}
 
     extended_attributes_string = match.group(1)
     extended_attributes = {}
-    # FIXME: this splitting is WRONG: it fails on ExtendedAttributeArgList like
-    # 'NamedConstructor=Foo(a, b)'
+    # FIXME: this splitting is WRONG: it fails on extended attributes where lists of
+    # multiple values are used, which are seperated by a comma and a space.
     parts = [extended_attribute.strip()
-             for extended_attribute in extended_attributes_string.split(',')
+             for extended_attribute in re.split(',\s+', extended_attributes_string)
              # Discard empty parts, which may exist due to trailing comma
              if extended_attribute.strip()]
     for part in parts:
         name, _, value = map(string.strip, part.partition('='))
         extended_attributes[name] = value
     return extended_attributes
 
 
 def get_put_forward_interfaces_from_idl(file_contents):
     put_forwards_pattern = (r'\[[^\]]*PutForwards=[^\]]*\]\s+'
                             r'readonly\s+'
                             r'attribute\s+'
                             r'(\w+)')
     return sorted(set(match.group(1)
                       for match in re.finditer(put_forwards_pattern,
                                                file_contents,
                                                flags=re.DOTALL)))