Rename deprecated "supplemental_dependencies" and clean up IDL dependency script

Source/bindings/scripts/generate-bindings.pl

 #!/usr/bin/perl -w
 #
 # Copyright (C) 2005 Apple Computer, Inc.
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # 
 # This file is part of WebKit
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
 # License as published by the Free Software Foundation; either
@@ skipping 28 matching lines @@
 use IDLParser;
 use CodeGeneratorV8;
 use IDLSerializer;
 
 my @idlDirectories;
 my $outputDirectory;
 my $defines;
 my $filename;
 my $preprocessor;
 my $verbose;
-my $supplementalDependencyFile;
+my $interfaceDependenciesFile;
 my $additionalIdlFiles;
 my $idlAttributesFile;
 my $writeFileOnlyIfChanged;
 
 GetOptions('include=s@' => \@idlDirectories,
            'outputDir=s' => \$outputDirectory,
            'defines=s' => \$defines,
            'filename=s' => \$filename,
            'preprocessor=s' => \$preprocessor,
            'verbose' => \$verbose,
-           'supplementalDependencyFile=s' => \$supplementalDependencyFile,
+           'interfaceDependenciesFile=s' => \$interfaceDependenciesFile,
            'additionalIdlFiles=s' => \$additionalIdlFiles,
            'idlAttributesFile=s' => \$idlAttributesFile,
            'write-file-only-if-changed=s' => \$writeFileOnlyIfChanged);
 
 my $targetIdlFile = $ARGV[0];
 
 die('Must specify input file.') unless defined($targetIdlFile);
 die('Must specify output directory.') unless defined($outputDirectory);
 $defines = "" unless defined($defines);
 
 $targetIdlFile = Cwd::realpath($targetIdlFile);
 if ($verbose) {
     print "$targetIdlFile\n";
 }
 my $targetInterfaceName = fileparse(basename($targetIdlFile), ".idl");
 
 my $idlFound = 0;
-my @supplementedIdlFiles;
-if ($supplementalDependencyFile) {
-    # The format of a supplemental dependency file:
+my @dependencyIdlFiles;
+if ($interfaceDependenciesFile) {
+    # The format of the interface dependencies file:
     #
     # Window.idl P.idl Q.idl R.idl
     # Document.idl S.idl
     # Event.idl
     # ...
     #
-    # The above indicates that Window.idl is supplemented by P.idl, Q.idl and R.idl,
-    # Document.idl is supplemented by S.idl, and Event.idl is supplemented by no IDLs.
-    # The IDL that supplements another IDL (e.g. P.idl) never appears in the dependency file.
-    open FH, "< $supplementalDependencyFile" or die "Cannot open $supplementalDependencyFile\n";
+    # The above indicates that Window.idl depends on P.idl, Q.idl, and R.idl,
+    # Document.idl depends on S.idl, and Event.idl depends on no IDLs.
+    # A dependency IDL file (one that is depended on by another IDL, e.g. P.idl
+    # in the above) does not have its own entry in the dependency file.
+    open FH, "< $interfaceDependenciesFile" or die "Cannot open $interfaceDependenciesFile\n";
     while (my $line = <FH>) {
         my ($idlFile, @followingIdlFiles) = split(/\s+/, $line);
         if ($idlFile and basename($idlFile) eq basename($targetIdlFile)) {
             $idlFound = 1;
-            # We sort the supplemental IDL files so that the corresponding code is generated
+            # We sort the dependency IDL files so that the corresponding code is generated
             # in a consistent order. This is important for the bindings tests.
-            @supplementedIdlFiles = sort @followingIdlFiles;
+            @dependencyIdlFiles = sort @followingIdlFiles;
         }
     }
     close FH;
 
     # $additionalIdlFiles is list of IDL files which should not be included in
-    # DerivedSources*.cpp (i.e. they are not described in the supplemental
-    # dependency file) but should generate .h and .cpp files.
+    # DerivedSources*.cpp (i.e. they are not described in the interface
+    # dependencies file) but should generate .h and .cpp files.
     if (!$idlFound and $additionalIdlFiles) {
         my @idlFiles = shellwords($additionalIdlFiles);
         $idlFound = grep { $_ and basename($_) eq basename($targetIdlFile) } @idlFiles;
     }
 
     if (!$idlFound) {
         # We generate empty .h and .cpp files just to tell build scripts that .h and .cpp files are created.
         generateEmptyHeaderAndCpp($targetInterfaceName, $outputDirectory);
         exit 0;
     }
 }
 
 # Parse the target IDL file.
 my $targetParser = IDLParser->new(!$verbose);
 my $targetDocument = $targetParser->Parse($targetIdlFile, $defines, $preprocessor);
 
 if ($idlAttributesFile) {
     my $idlAttributes = loadIDLAttributes($idlAttributesFile);
     checkIDLAttributes($idlAttributes, $targetDocument, basename($targetIdlFile));
 }
 
-foreach my $idlFile (@supplementedIdlFiles) {
+foreach my $idlFile (@dependencyIdlFiles) {
     next if $idlFile eq $targetIdlFile;
 
     my $interfaceName = fileparse(basename($idlFile), ".idl");
     my $parser = IDLParser->new(!$verbose);
     my $document = $parser->Parse($idlFile, $defines, $preprocessor);
 
     foreach my $interface (@{$document->interfaces}) {
         if (!$interface->isPartial || $interface->name eq $targetInterfaceName) {
             my $targetDataNode;
             foreach my $interface (@{$targetDocument->interfaces}) {
@@ skipping 30 matching lines @@
             foreach my $constant (@{$interface->constants}) {
                 # Record that this constant is implemented by $interfaceName.
                 $constant->extendedAttributes->{"ImplementedBy"} = $interfaceName if $interface->isPartial;
 
                 # Add interface-wide extended attributes to each constant.
                 applyInterfaceExtendedAttributes($interface, $constant->extendedAttributes);
 
                 push(@{$targetDataNode->constants}, $constant);
             }
         } else {
-            die "$idlFile is not a supplemental dependency of $targetIdlFile. There maybe a bug in the the supplemental dependency generator (preprocess_idls.py).\n";
+            die "$idlFile is not a dependency of $targetIdlFile. There maybe a bug in the dependency computer (compute_dependencies.py).\n";
         }
     }
 }
 
 # FIXME: This code will be removed once IDLParser.pm and CodeGeneratorV8.pm
 # are connected via JSON files. See http://crbug.com/242795
 $targetDocument = deserializeJSON(serializeJSON($targetDocument));
 
 # Generate desired output for the target IDL file.
-my @dependentIdlFiles = ($targetDocument->fileName(), @supplementedIdlFiles);
-my $codeGenerator = CodeGeneratorV8->new($targetDocument, \@idlDirectories, $preprocessor, $defines, $verbose, \@dependentIdlFiles, $writeFileOnlyIfChanged);
+my @interfaceIdlFiles = ($targetDocument->fileName(), @dependencyIdlFiles);
+my $codeGenerator = CodeGeneratorV8->new($targetDocument, \@idlDirectories, $preprocessor, $defines, $verbose, \@interfaceIdlFiles, $writeFileOnlyIfChanged);
 my $interfaces = $targetDocument->interfaces;
 foreach my $interface (@$interfaces) {
     print "Generating bindings code for IDL interface \"" . $interface->name . "\"...\n" if $verbose;
     $codeGenerator->GenerateInterface($interface);
     $codeGenerator->WriteData($interface, $outputDirectory);
 }
 
 sub generateEmptyHeaderAndCpp
 {
     my ($targetInterfaceName, $outputDirectory) = @_;
@@ skipping 102 matching lines @@
                 last OUTER;
             }
         }
     }
     if ($error) {
         die "IDL ATTRIBUTE CHECKER ERROR: $error
 If you want to add a new IDL attribute, you need to add it to bindings/scripts/IDLAttributes.txt and add explanations to the Blink IDL document (http://chromium.org/blink/webidl).
 ";
     }
 }