X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstrict.pm;h=bcb1321613ab2632fec934abf6c6ee46346648c8;hb=3a2d17640c711a74da5a32d6750db585e6944152;hp=d1479ed865ee1dd4c627f6d08ec90728f628c70c;hpb=e279cb0b1bca3fd51526cebcf39440049559cc98;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/strict.pm b/lib/strict.pm
index d1479ed..bcb1321 100644
--- a/lib/strict.pm
+++ b/lib/strict.pm
@@ -1,6 +1,13 @@
 package strict;
 
-$strict::VERSION = "1.02";
+$strict::VERSION = "1.04";
+
+# Verify that we're called correctly so that strictures will work.
+unless ( __FILE__ =~ /(^|[\/\\])\Q@{[__PACKAGE__]}\E\.pm$/ ) {
+    # Can't use Carp, since Carp uses us!
+    my (undef, $f, $l) = caller;
+    die("Incorrect use of pragma '@{[__PACKAGE__,]}' at $f line $l.\n");
+}
 
 my %bitmask = (
 refs => 0x00000002,
@@ -22,14 +29,16 @@ sub bits {
     $bits;
 }
 
+my $default_bits = bits(qw(refs subs vars));
+
 sub import {
     shift;
-    $^H |= bits(@_ ? @_ : qw(refs subs vars));
+    $^H |= @_ ? bits(@_) : $default_bits;
 }
 
 sub unimport {
     shift;
-    $^H &= ~ bits(@_ ? @_ : qw(refs subs vars));
+    $^H &= ~ (@_ ? bits(@_) : $default_bits);
 }
 
 1;
@@ -83,7 +92,7 @@ is allowed so that C<goto &$AUTOLOAD> would not break under stricture.
 =item C<strict vars>
 
 This generates a compile-time error if you access a variable that wasn't
-declared via "our" or C<use vars>,
+declared via C<our> or C<use vars>,
 localized via C<my()>, or wasn't fully qualified.  Because this is to avoid
 variable suicide problems and subtle dynamic scoping issues, a merely
 local() variable isn't good enough.  See L<perlfunc/my> and
@@ -108,18 +117,31 @@ exempted from this check.
 
 This disables the poetry optimization, generating a compile-time error if
 you try to use a bareword identifier that's not a subroutine, unless it
-appears in curly braces or on the left hand side of the "=E<gt>" symbol.
-
+is a simple identifier (no colons) and that it appears in curly braces or
+on the left hand side of the C<< => >> symbol.
 
     use strict 'subs';
     $SIG{PIPE} = Plumber;   	# blows up
-    $SIG{PIPE} = "Plumber"; 	# just fine: bareword in curlies always ok
+    $SIG{PIPE} = "Plumber"; 	# just fine: quoted string is always ok
     $SIG{PIPE} = \&Plumber; 	# preferred form
 
-
-
 =back
 
 See L<perlmodlib/Pragmatic Modules>.
 
+=head1 HISTORY
+
+C<strict 'subs'>, with Perl 5.6.1, erroneously permitted to use an unquoted
+compound identifier (e.g. C<Foo::Bar>) as a hash key (before C<< => >> or
+inside curlies), but without forcing it always to a literal string.
+
+Starting with Perl 5.8.1 strict is strict about its restrictions:
+if unknown restrictions are used, the strict pragma will abort with
+
+    Unknown 'strict' tag(s) '...'
+
+As of version 1.04 (Perl 5.10), strict verifies that it is used as
+"strict" to avoid the dreaded Strict trap on case insensitive file
+systems.
+
 =cut