Make tables for Perl-tailored Unicode Line_Break property

[perl5.git] / lib / strict.pm

diff --git a/lib/strict.pm b/lib/strict.pm
index 3616753..93f2122 100644 (file)
--- a/lib/strict.pm
+++ b/lib/strict.pm
@@ -1,26 +1,54 @@
 package strict;
 
-$strict::VERSION = "1.04";
+$strict::VERSION = "1.10";
 
 # Verify that we're called correctly so that strictures will work.
-unless ( __FILE__ =~ /(^|[\/\\])\Q@{[__PACKAGE__]}\E\.pmc?$/ ) {
+unless ( __FILE__ =~ /(^|[\/\\])\Q${\__PACKAGE__}\E\.pmc?$/ ) {
     # Can't use Carp, since Carp uses us!
     my (undef, $f, $l) = caller;
-    die("Incorrect use of pragma '@{[__PACKAGE__,]}' at $f line $l.\n");
+    die("Incorrect use of pragma '${\__PACKAGE__}' at $f line $l.\n");
 }
 
-my %bitmask = (
-refs => 0x00000002,
-subs => 0x00000200,
-vars => 0x00000400
-);
+my ( %bitmask, %explicit_bitmask );
+
+BEGIN {
+    %bitmask = (
+        refs => 0x00000002,
+        subs => 0x00000200,
+        vars => 0x00000400,
+    );
+
+    %explicit_bitmask = (
+        refs => 0x00000020,
+        subs => 0x00000040,
+        vars => 0x00000080,
+    );
+
+    my $bits = 0;
+    $bits |= $_ for values %bitmask;
+
+    my $inline_all_bits = $bits;
+    *all_bits = sub () { $inline_all_bits };
+
+    $bits = 0;
+    $bits |= $_ for values %explicit_bitmask;
+
+    my $inline_all_explicit_bits = $bits;
+    *all_explicit_bits = sub () { $inline_all_explicit_bits };
+}
 
 sub bits {
     my $bits = 0;
     my @wrong;
     foreach my $s (@_) {
-       push @wrong, $s unless exists $bitmask{$s};
-        $bits |= $bitmask{$s} || 0;
+        if (exists $bitmask{$s}) {
+            $^H |= $explicit_bitmask{$s};
+
+            $bits |= $bitmask{$s};
+        }
+        else {
+            push @wrong, $s;
+        }
     }
     if (@wrong) {
         require Carp;
@@ -29,16 +57,21 @@ sub bits {
     $bits;
 }
 
-my $default_bits = bits(qw(refs subs vars));
-
 sub import {
     shift;
-    $^H |= @_ ? bits(@_) : $default_bits;
+    $^H |= @_ ? &bits : all_bits | all_explicit_bits;
 }
 
 sub unimport {
     shift;
-    $^H &= ~ (@_ ? bits(@_) : $default_bits);
+
+    if (@_) {
+        $^H &= ~&bits;
+    }
+    else {
+        $^H &= ~all_bits;
+        $^H |= all_explicit_bits;
+    }
 }
 
 1;
@@ -61,6 +94,10 @@ strict - Perl pragma to restrict unsafe constructs
 
 =head1 DESCRIPTION
 
+The C<strict> pragma disables certain Perl expressions that could behave
+unexpectedly or are difficult to debug, turning them into errors. The
+effect of this pragma is limited to the current file or scope block.
+
 If no import list is supplied, all possible restrictions are assumed.
 (This is the safest mode to operate in, but is sometimes too strict for
 casual programming.)  Currently, there are three possible things to be
@@ -91,17 +128,17 @@ 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 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
-L<perlfunc/local>.
+This generates a compile-time error if you access a variable that was
+neither explicitly declared (using any of C<my>, C<our>, C<state>, or C<use
+vars>) nor fully qualified.  (Because this is to avoid variable suicide
+problems and subtle dynamic scoping issues, a merely C<local> variable isn't
+good enough.)  See L<perlfunc/my>, L<perlfunc/our>, L<perlfunc/state>,
+L<perlfunc/local>, and L<vars>.
 
     use strict 'vars';
     $X::foo = 1;        # ok, fully qualified
     my $foo = 10;       # ok, my() var
-    local $foo = 9;     # blows up
+    local $baz = 9;     # blows up, $baz not declared before
 
     package Cinna;
     our $bar;                  # Declares $bar in current package
@@ -121,9 +158,9 @@ 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: quoted string is always ok
-    $SIG{PIPE} = \&Plumber;    # preferred form
+    $SIG{PIPE} = Plumber;   # blows up
+    $SIG{PIPE} = "Plumber"; # fine: quoted string is always ok
+    $SIG{PIPE} = \&Plumber; # preferred form
 
 =back