mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-11 13:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rationalize ‘use’ order in Perl code.

Browse Source 
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.
This commit is contained in:
Zack Weinberg 2020-08-31 11:23:00 -04:00
parent 17c048d859
commit 6d5e6ba904
No known key found for this signature in database
GPG Key ID: 384F8E68AC65B0D5
15 changed files with 84 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/autoheader.in
View File

@ -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@';

8
bin/autom4te.in
View File

@ -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@';

11
bin/autoreconf.in
View File

@ -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. ##

17
bin/autoscan.in
View File

@ -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 Autom4te::ChannelDefs;
use Autom4te::Configure_ac;
use Autom4te::General;
use Autom4te::FileUtils;
use Autom4te::XFile;
use File::Basename;
use File::Find;
use strict;
use warnings;
use Autom4te::ChannelDefs;
use Autom4te::Configure_ac;
use Autom4te::FileUtils;
use Autom4te::General;
use Autom4te::XFile;
use vars qw(@cfiles @makefiles @shfiles @subdirs %printed);

9
bin/autoupdate.in
View File

@ -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@';

5
bin/ifnames.in
View File

@ -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
# -----

11
lib/Autom4te/C4che.pm
View File

@ -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)>

4
lib/Autom4te/ChannelDefs.pm
View File

@ -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 vars qw (@EXPORT @ISA);
@ISA = qw (Exporter);
@EXPORT = qw (&prog_error &error &fatal &verb
&switch_warning &parse_WARNINGS &parse_warnings);

5
lib/Autom4te/Channels.pm
View File

@ -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

7
lib/Autom4te/Configure_ac.pm
View File

@ -23,12 +23,13 @@ package Autom4te::Configure_ac;
use 5.006;
use strict;
use warnings;
use Exporter;
use Autom4te::Channels;
use Autom4te::ChannelDefs;
use Autom4te::Channels;
use vars qw (@ISA @EXPORT);
use vars qw (@EXPORT @ISA);
@ISA = qw (Exporter);
@EXPORT = qw (&find_configure_ac &require_configure_ac);

7
lib/Autom4te/FileUtils.pm
View File

@ -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 Autom4te::Channels;
use vars qw (@ISA @EXPORT);
use vars qw (@EXPORT @ISA);
@ISA = qw (Exporter);
@EXPORT = qw (&contents
&find_file &mtime

16
lib/Autom4te/General.pm
View File

@ -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.

10
lib/Autom4te/Getopt.pm
View File

@ -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)>

4
lib/Autom4te/Request.pm
View File

@ -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

19
lib/Autom4te/XFile.pm
View File

@ -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