Updated to Chrome 45 (2454) moved from SVN to git.

bindings/scripts/idl_reader.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 24 matching lines @@
 import os
 
 import blink_idl_parser
 from blink_idl_parser import BlinkIDLParser
 from idl_definitions import IdlDefinitions
 from idl_validator import EXTENDED_ATTRIBUTES_RELATIVE_PATH, IDLInvalidExtendedAttributeError, IDLExtendedAttributeValidator
 from interface_dependency_resolver import InterfaceDependencyResolver
 from utilities import idl_filename_to_component
 
 
+def validate_blink_idl_definitions(idl_filename, idl_file_basename,
+                                   definitions):
+    """Validate file contents with filename convention.
+
+       The Blink IDL conventions are:
+       - If an IDL file defines an interface, a dictionary, or an exception,
+         the IDL file must contain exactly one definition. The definition
+         name must agree with the file's basename, unless it is a partial
+         definition. (e.g., 'partial interface Foo' can be in FooBar.idl).
+       - An IDL file can contain typedefs and enums without having other
+         definitions. There is no filename convention in this case.
+       - Otherwise, an IDL file is invalid.
+    """
+    targets = (definitions.interfaces.values() +
+               definitions.dictionaries.values())
+    number_of_targets = len(targets)
+    if number_of_targets > 1:
+        raise Exception(
+            'Expected exactly 1 definition in file {0}, but found {1}'
+            .format(idl_filename, number_of_targets))
+    if number_of_targets == 0:
+        if not (definitions.enumerations or definitions.typedefs):
+            raise Exception(
+                'No definition found in %s' % idl_filename)
+        return
+    target = targets[0]
+    if not target.is_partial and target.name != idl_file_basename:
+        raise Exception(
+            'Definition name "{0}" disagrees with IDL file basename "{1}".'
+            .format(target.name, idl_file_basename))
+
+
 class IdlReader(object):
     def __init__(self, interfaces_info=None, outputdir='', multi_interface=False):
         self.multi_interface = multi_interface
         self.extended_attribute_validator = IDLExtendedAttributeValidator()
         self.interfaces_info = interfaces_info
 
         if interfaces_info:
             self.interface_dependency_resolver = InterfaceDependencyResolver(interfaces_info, self)
         else:
             self.interface_dependency_resolver = None
@@ skipping 21 matching lines @@
         The IdlDefinitions object is guaranteed to contain a single
         IdlInterface; it may also contain other definitions, such as
         callback functions and enumerations."""
         ast = blink_idl_parser.parse_file(self.parser, idl_filename)
         if not ast:
             raise Exception('Failed to parse %s' % idl_filename)
         idl_file_basename, _ = os.path.splitext(os.path.basename(idl_filename))
         definitions = IdlDefinitions(idl_file_basename, ast)
 
         if not self.multi_interface:
-            # Validate file contents with filename convention
-            # The Blink IDL filenaming convention is that the file
-            # <definition_name>.idl MUST contain exactly 1 definition
-            # (interface, dictionary or exception), and the definition name must
-            # agree with the file's basename, unless it is a partial definition.
-            # (e.g., 'partial interface Foo' can be in FooBar.idl).
-            targets = (definitions.interfaces.values() +
-                       definitions.dictionaries.values())
-            number_of_targets = len(targets)
-            if number_of_targets != 1:
-                raise Exception(
-                    'Expected exactly 1 definition in file {0}, but found {1}'
-                    .format(idl_filename, number_of_targets))
-            target = targets[0]
-            if not target.is_partial and target.name != idl_file_basename:
-                raise Exception(
-                    'Definition name "{0}" disagrees with IDL file basename "{1}".'
-                    .format(target.name, idl_file_basename))
+            validate_blink_idl_definitions(idl_filename, idl_file_basename, definitions)
         else:
             if len(definitions.interfaces) > 1:
                 print '----- Supplemental interfaces %s' % len(definitions.interfaces)
 
         # Validate extended attributes
         if not self.extended_attribute_validator:
             return definitions
 
         try:
             self.extended_attribute_validator.validate_extended_attributes(definitions)
         except IDLInvalidExtendedAttributeError as error:
             raise IDLInvalidExtendedAttributeError("""
 IDL ATTRIBUTE ERROR in file:
 %s:
     %s
 If you want to add a new IDL extended attribute, please add it to:
     %s
 and add an explanation to the Blink IDL documentation at:
     http://www.chromium.org/blink/webidl/blink-idl-extended-attributes
     """ % (idl_filename, str(error), EXTENDED_ATTRIBUTES_RELATIVE_PATH))
 
         return definitions