Rationalize ‘use’ order in Perl code.

All the Perl scripts and modules now ‘use’ other modules in the
following order:

 - use 5.006; use strict; use warnings; in that order.
   If a file was not already use-ing one of these three, it was added.

 - The BEGIN block that adds the installation directory for the
   Autom4te:: modules to @INC, if necessary.

 - All stdlib modules whose name begins with a capital letter,
   in ASCII sort order.

 - All Autom4te:: modules, in ASCII sort order.

 - ‘use vars qw (...)’, if any, last.

Also, ‘use foo qw (...)’ and @ISA lists have been sorted into ASCII
sort order.  (@EXPORT lists, which often follow immediately after @ISA
lists, have *not* been sorted, as these appear to have been organized
semantically in many cases.)  qw delimiters have been normalized to
round parentheses with a space between the qw and the open paren.

* bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in
* bin/autoscan.in, bin/autoupdate.in, bin/ifnames.in
* lib/Autom4te/C4che.pm, lib/Autom4te/ChannelDefs.pm
* lib/Autom4te/Channels.pm, lib/Autom4te/Configure_ac.pm
* lib/Autom4te/FileUtils.pm, lib/Autom4te/General.pm
* lib/Autom4te/Getopt.pm, lib/Autom4te/Request.pm
* lib/Autom4te/XFile.pm: Rationalize order and format of ‘use’
  directives and @ISA lists.  Add any of ‘use 5.006’, ‘use strict’,
  and ‘use warnings’ that was not already present.

15 files changed, 82 insertions, 54 deletions

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 2a9a2e07..3068e2b0 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -26,6 +26,10 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 # Written by Roland McGrath.
 # Rewritten in Perl by Akim Demaille.
 
+use 5.006;
+use strict;
+use warnings;
+
 BEGIN
 {
   my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -44,10 +48,9 @@ use Autom4te::Configure_ac;
 use Autom4te::FileUtils;
 use Autom4te::General;
 use Autom4te::XFile;
-use strict;
 
 # Using 'do FILE', we need 'local' vars.
-use vars qw ($config_h %verbatim %symbol);
+use vars qw ($config_h %symbol %verbatim);
 
 # Lib files.
 my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 0662767d..f03fef07 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -22,6 +22,9 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+use 5.006;
+use strict;
+use warnings;
 
 BEGIN
 {
@@ -35,15 +38,14 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+use File::Basename;
+
 use Autom4te::C4che;
 use Autom4te::ChannelDefs;
 use Autom4te::Channels;
 use Autom4te::FileUtils;
 use Autom4te::General;
 use Autom4te::XFile;
-use File::Basename;
-use strict;
-use warnings;
 
 # Data directory.
 my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index eea69da4..a3424f95 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -24,6 +24,10 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 # Written by David J. MacKenzie.
 # Extended and rewritten in Perl by Akim Demaille.
 
+use 5.006;
+use strict;
+use warnings;
+
 BEGIN
 {
   my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -36,16 +40,15 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+# Do not use Cwd::chdir, since it might hang.
+use Cwd qw (cwd);
+
 use Autom4te::ChannelDefs;
 use Autom4te::Channels;
 use Autom4te::Configure_ac;
 use Autom4te::FileUtils;
 use Autom4te::General;
 use Autom4te::XFile;
-# Do not use Cwd::chdir, since it might hang.
-use Cwd 'cwd';
-use strict;
-use warnings;
 
 ## ----------- ##
 ## Variables.  ##
diff --git a/bin/autoscan.in b/bin/autoscan.in
index 0026c428..ef7e0c12 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -23,6 +23,10 @@
 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
+use 5.006;
+use strict;
+use warnings;
+
 BEGIN
 {
   my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -35,15 +39,14 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+use File::Basename;
+use File::Find;
+
 use Autom4te::ChannelDefs;
 use Autom4te::Configure_ac;
-use Autom4te::General;
 use Autom4te::FileUtils;
+use Autom4te::General;
 use Autom4te::XFile;
-use File::Basename;
-use File::Find;
-use strict;
-use warnings;
 
 use vars qw(@cfiles @makefiles @shfiles @subdirs %printed);
 
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index af8dd55b..c4ae4bde 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -24,6 +24,10 @@
 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
+use 5.006;
+use strict;
+use warnings;
+
 BEGIN
 {
   my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -36,15 +40,14 @@ BEGIN
   $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
+use File::Basename;
+
 use Autom4te::ChannelDefs;
 use Autom4te::Channels;
 use Autom4te::Configure_ac;
 use Autom4te::FileUtils;
 use Autom4te::General;
 use Autom4te::XFile;
-use File::Basename;
-use strict;
-use warnings;
 
 # Lib files.
 my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
diff --git a/bin/ifnames.in b/bin/ifnames.in
index f60d3a0f..72abe881 100644
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -29,6 +29,10 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 # Written by David MacKenzie <djm@gnu.ai.mit.edu>
 # and Paul Eggert <eggert@twinsun.com>.
 
+use 5.006;
+use strict;
+use warnings;
+
 BEGIN
 {
   my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
@@ -44,7 +48,6 @@ BEGIN
 use Autom4te::General;
 use Autom4te::XFile;
 use Autom4te::FileUtils;
-use warnings;
 
 # $HELP
 # -----
diff --git a/lib/Autom4te/C4che.pm b/lib/Autom4te/C4che.pm
index 6226cd63..2032f59c 100644
--- a/lib/Autom4te/C4che.pm
+++ b/lib/Autom4te/C4che.pm
@@ -31,12 +31,15 @@ This Perl module handles the cache of M4 runs used by autom4te.
 
 =cut
 
-use Data::Dumper;
-use Autom4te::Request;
-use Carp;
+use 5.006;
 use strict;
 use warnings;
 
+use Carp;
+use Data::Dumper;
+
+use Autom4te::Request;
+
 =over 4
 
 =item @request
@@ -50,7 +53,7 @@ work with "my" vars, and I do not know whether the current behavior
 
 =cut
 
-use vars qw(@request);
+use vars qw (@request);
 
 =item C<$req = Autom4te::C4che-E<gt>retrieve (%attr)>
 
diff --git a/lib/Autom4te/ChannelDefs.pm b/lib/Autom4te/ChannelDefs.pm
index c706b6dc..24e4bb61 100644
--- a/lib/Autom4te/ChannelDefs.pm
+++ b/lib/Autom4te/ChannelDefs.pm
@@ -50,10 +50,10 @@ shorthand function to output on specific channels.
 use 5.006;
 use strict;
 use warnings;
-use Exporter;
 
-use vars qw (@ISA @EXPORT);
+use Exporter;
 
+use vars qw (@EXPORT @ISA);
 @ISA = qw (Exporter);
 @EXPORT = qw (&prog_error &error &fatal &verb
 	      &switch_warning &parse_WARNINGS &parse_warnings);
diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index ffe7361c..f2f4b997 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
@@ -69,11 +69,12 @@ etc.) that can also be overridden on a per-message basis.
 use 5.006;
 use strict;
 use warnings;
-use Exporter;
+
 use Carp;
+use Exporter;
 use File::Basename;
 
-use vars qw (@ISA @EXPORT %channels $me);
+use vars qw (@EXPORT @ISA %channels $me);
 
 @ISA = qw (Exporter);
 @EXPORT = qw ($exit_code $warnings_are_errors
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index bf3ad99b..f84e7336 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
@@ -23,12 +23,13 @@ package Autom4te::Configure_ac;
 use 5.006;
 use strict;
 use warnings;
+
 use Exporter;
-use Autom4te::Channels;
-use Autom4te::ChannelDefs;
 
-use vars qw (@ISA @EXPORT);
+use Autom4te::ChannelDefs;
+use Autom4te::Channels;
 
+use vars qw (@EXPORT @ISA);
 @ISA = qw (Exporter);
 @EXPORT = qw (&find_configure_ac &require_configure_ac);
 
diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index 7b7959f9..ef1a2a7f 100644
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -37,14 +37,15 @@ This perl module provides various general purpose file handling functions.
 use 5.006;
 use strict;
 use warnings;
+
 use Exporter;
 use File::stat;
 use IO::File;
-use Autom4te::Channels;
-use Autom4te::ChannelDefs;
 
-use vars qw (@ISA @EXPORT);
+use Autom4te::ChannelDefs;
+use Autom4te::Channels;
 
+use vars qw (@EXPORT @ISA);
 @ISA = qw (Exporter);
 @EXPORT = qw (&contents
 	      &find_file &mtime
diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index 76dbd426..922e4767 100644
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -33,19 +33,21 @@ used in several executables of the Autoconf package.
 =cut
 
 use 5.006;
+use strict;
+use warnings;
+
+use Carp;
 use Exporter;
-use Autom4te::ChannelDefs;
-use Autom4te::Channels;
-use Autom4te::Getopt ();
 use File::Basename;
 use File::Path ();
 use File::stat;
 use IO::File;
-use Carp;
-use strict;
-use warnings;
-use vars qw (@ISA @EXPORT);
 
+use Autom4te::ChannelDefs;
+use Autom4te::Channels;
+use Autom4te::Getopt ();
+
+use vars qw (@EXPORT @ISA);
 @ISA = qw (Exporter);
 
 # Variables we define and export.
diff --git a/lib/Autom4te/Getopt.pm b/lib/Autom4te/Getopt.pm
index 42133e32..f70a5c58 100644
--- a/lib/Autom4te/Getopt.pm
+++ b/lib/Autom4te/Getopt.pm
@@ -33,14 +33,16 @@ line options in conformance to the GNU Coding standards.
 use 5.006;
 use strict;
 use warnings FATAL => 'all';
+
+use Carp qw (confess croak);
 use Exporter ();
 use Getopt::Long ();
-use Autom4te::ChannelDefs qw/fatal/;
-use Carp qw/croak confess/;
 
-use vars qw (@ISA @EXPORT);
+use Autom4te::ChannelDefs qw (fatal);
+
+use vars qw (@EXPORT @ISA);
 @ISA = qw (Exporter);
-@EXPORT= qw/getopt/;
+@EXPORT = qw (getopt);
 
 =item C<parse_options (%option)>
 
diff --git a/lib/Autom4te/Request.pm b/lib/Autom4te/Request.pm
index 5db75463..0b97615d 100644
--- a/lib/Autom4te/Request.pm
+++ b/lib/Autom4te/Request.pm
@@ -32,10 +32,12 @@ used in several executables of the Autoconf and Automake packages.
 
 =cut
 
+use 5.006;
 use strict;
 use warnings;
-use Class::Struct;
+
 use Carp;
+use Class::Struct;
 use Data::Dumper;
 
 struct
diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm
index 538d383b..8a49ac1a 100644
--- a/lib/Autom4te/XFile.pm
+++ b/lib/Autom4te/XFile.pm
@@ -72,23 +72,22 @@ and C<getlines> methods to translate C<\r\n> to C<\n>.
 use 5.006;
 use strict;
 use warnings;
-use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
+
 use Carp;
+use DynaLoader;
 use Errno;
-use IO::File;
+use Exporter;
 use File::Basename;
+use IO::File;
+
 use Autom4te::ChannelDefs;
-use Autom4te::Channels qw(msg);
+use Autom4te::Channels qw (msg);
 use Autom4te::FileUtils;
 
-require Exporter;
-require DynaLoader;
-
-@ISA = qw(IO::File Exporter DynaLoader);
-
-$VERSION = "1.2";
-
+use vars qw ($AUTOLOAD @EXPORT @EXPORT_OK @ISA $VERSION);
+@ISA = qw (DynaLoader Exporter IO::File);
 @EXPORT = @IO::File::EXPORT;
+$VERSION = "1.2";
 
 eval {
   # Make all Fcntl O_XXX and LOCK_XXX constants available for importing