X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstrictures.pm;h=5bd43eca507396b5a32a9a00c5ca92a62874ec2c;hb=1e139b49372a4dbd05942d512dc12e68e708eade;hp=e1fe7530be66152c517d35b2b372a5473e6bd8dc;hpb=c5a67be6e1a9aa58c86d34968262c4bcf770d73e;p=p5sagit%2Fstrictures.git diff --git a/lib/strictures.pm b/lib/strictures.pm index e1fe753..5bd43ec 100644 --- a/lib/strictures.pm +++ b/lib/strictures.pm @@ -7,9 +7,80 @@ BEGIN { *_PERL_LT_5_8_4 = ($] < 5.008004) ? sub(){1} : sub(){0}; } -our $VERSION = '1.005006'; +our $VERSION = '2.000000'; $VERSION = eval $VERSION; +our @WARNING_CATEGORIES = grep { exists $warnings::Offsets{$_} } qw( + closure + deprecated + exiting + experimental + experimental::autoderef + experimental::const_attr + experimental::lexical_subs + experimental::lexical_topic + experimental::postderef + experimental::re_strict + experimental::refaliasing + experimental::regex_sets + experimental::signatures + experimental::smartmatch + experimental::win32_perlio + glob + imprecision + io + closed + exec + layer + newline + pipe + syscalls + unopened + locale + misc + missing + numeric + once + overflow + pack + portable + recursion + redefine + redundant + regexp + severe + debugging + inplace + internal + malloc + signal + substr + syntax + ambiguous + bareword + digit + illegalproto + parenthesis + precedence + printf + prototype + qw + reserved + semicolon + taint + threads + uninitialized + unpack + untie + utf8 + non_unicode + nonchar + surrogate + void + void_unusual + y2k +); + sub VERSION { no warnings; local $@; @@ -44,7 +115,8 @@ sub _enable { if !defined $version; my $method = "_enable_$version"; if (!$class->can($method)) { - die "Major version specified as $version - not supported!"; + require Carp; + Carp::croak("Major version specified as $version - not supported!"); } $class->$method($opts); } @@ -65,15 +137,56 @@ sub _enable_1 { } } -sub _want_extra { - my $file = shift; +our @V2_NONFATAL = grep { exists $warnings::Offsets{$_} } ( + 'exec', # not safe to catch + 'recursion', # will be caught by other mechanisms + 'internal', # not safe to catch + 'malloc', # not safe to catch + 'newline', # stat on nonexistent file with a newline in it + 'experimental', # no reason for these to be fatal + 'deprecated', # unfortunately can't make these fatal + 'portable', # everything worked fine here, just may not elsewhere +); +our @V2_DISABLE = grep { exists $warnings::Offsets{$_} } ( + 'once' # triggers inconsistently, can't be fatalized +); + +sub _enable_2 { + my ($class, $opts) = @_; + strict->import; + warnings->import; + warnings->import(FATAL => @WARNING_CATEGORIES); + warnings->unimport(FATAL => @V2_NONFATAL); + warnings->import(@V2_NONFATAL); + warnings->unimport(@V2_DISABLE); + + if (_want_extra($opts->{file})) { + _load_extras(qw(indirect multidimensional bareword::filehandles)); + indirect->unimport(':fatal') + if $extra_load_states{indirect}; + multidimensional->unimport + if $extra_load_states{multidimensional}; + bareword::filehandles->unimport + if $extra_load_states{'bareword::filehandles'}; + } +} + +sub _want_extra_env { if (exists $ENV{PERL_STRICTURES_EXTRA}) { if (_PERL_LT_5_8_4 and $ENV{PERL_STRICTURES_EXTRA}) { die 'PERL_STRICTURES_EXTRA checks are not available on perls older' . "than 5.8.4: please unset \$ENV{PERL_STRICTURES_EXTRA}\n"; } - return $ENV{PERL_STRICTURES_EXTRA}; + return $ENV{PERL_STRICTURES_EXTRA} ? 1 : 0; } + return undef; +} + +sub _want_extra { + my $file = shift; + my $want_env = _want_extra_env(); + return $want_env + if defined $want_env; return ( !_PERL_LT_5_8_4 and $file =~ /^(?:t|xt|lib|blib)[\\\/]/ @@ -129,12 +242,23 @@ strictures - turn on strict and make all warnings fatal =head1 SYNOPSIS - use strictures 1; + use strictures 2; is equivalent to use strict; use warnings FATAL => 'all'; + use warnings NONFATAL => qw( + exec + recursion + internal + malloc + newline + experimental + deprecated + portable + ); + no warnings 'once'; except when called from a file which matches: @@ -145,14 +269,8 @@ and when either C<.git>, C<.svn>, or C<.hg> is present in the current directory C<.git>, C<.svn>, or C<.hg> is present two directories up along with C (which would indicate we are in a C operation, via L) -- or when the C environment variable is -set, in which case - - use strictures 1; +set, in which case it also does the equivalent of -is equivalent to - - use strict; - use warnings FATAL => 'all'; no indirect 'fatal'; no multidimensional; no bareword::filehandles; @@ -195,20 +313,47 @@ increase (e.g. 1.000000 to 1.001000 (1.1.0) or similar). Any fixes only to the mechanism of this code will result in a sub-version increase (e.g. 1.000000 to 1.000001 (1.0.1)). -If the behaviour of C in normal mode changes in any way, that -will constitute a major version increase -- and the code already checks -when its version is tested to ensure that +=head1 VERSIONS + +Depending on the version of strictures requested, different warnings will be +enabled. If no specific version is requested, the current version's behavior +will be used. Versions can be requested using perl's standard mechanism: + + use strictures 2; + +Or, by passing in a C option: + + use strictures version => 2; + +=head2 VERSION 2 + +Equivalent to: + + use strict; + use warnings FATAL => 'all'; + use warnings NONFATAL => 'deprecated', 'experimental'; + # and if in dev mode: + no indirect 'fatal'; + no multidimensional; + no bareword::filehandles; + +=head2 VERSION 1 - use strictures 1; +Equivalent to: -will continue to only introduce the current set of strictures even if 2.0 is -installed. + use strict; + use warnings FATAL => 'all'; + # and if in dev mode: + no indirect 'fatal'; + no multidimensional; + no bareword::filehandles; =head1 METHODS =head2 import -This method does the setup work described above in L +This method does the setup work described above in L. Optionally +accepts a C option to request a specific version's behavior. =head2 VERSION