X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fconstant.pm;h=72ad79365347ad17509cec065da5c8f2d1035a20;hb=5723c3d7f504a443ea7120d38f98cd4fc9a869f3;hp=31f47fbf543b19ef9cc6680f3ae1d0b8110482b3;hpb=837638265c936ed27578a2aa7829a47e866303b0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/constant.pm b/lib/constant.pm
index 31f47fb..72ad793 100644
--- a/lib/constant.pm
+++ b/lib/constant.pm
@@ -1,15 +1,16 @@
 package constant;
 
 use strict;
-use vars qw( $VERSION %declared );
-$VERSION = '1.01';
+use 5.005_64;
+use warnings::register;
 
-#=======================================================================
+our($VERSION, %declared);
+$VERSION = '1.02';
 
-require 5.005_62;
+#=======================================================================
 
 # Some names are evil choices.
-my %keywords = map +($_, 1), qw{ BEGIN INIT STOP END DESTROY AUTOLOAD };
+my %keywords = map +($_, 1), qw{ BEGIN INIT CHECK END DESTROY AUTOLOAD };
 
 my %forced_into_main = map +($_, 1),
     qw{ STDIN STDOUT STDERR ARGV ARGVOUT ENV INC SIG };
@@ -35,7 +36,7 @@ sub import {
     my $pkg = caller;
 
     # Normal constant name
-    if ($name =~ /^(?:[A-Z]\w|_[A-Z])\w*\z/ and !$forbidden{$name}) {
+    if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
         # Everything is okay
 
     # Name forced into main, but we're not in main. Fatal.
@@ -51,23 +52,17 @@ sub import {
     # Maybe the name is tolerable
     } elsif ($name =~ /^[A-Za-z_]\w*\z/) {
 	# Then we'll warn only if you've asked for warnings
-	if ($^W) {
-	    require Carp;
+	if (warnings::enabled()) {
 	    if ($keywords{$name}) {
-		Carp::carp("Constant name '$name' is a Perl keyword");
+		warnings::warn("Constant name '$name' is a Perl keyword");
 	    } elsif ($forced_into_main{$name}) {
-		Carp::carp("Constant name '$name' is " .
+		warnings::warn("Constant name '$name' is " .
 		    "forced into package main::");
-	    } elsif (1 == length $name) {
-		Carp::carp("Constant name '$name' is too short");
-	    } elsif ($name =~ /^_?[a-z\d]/) {
-		Carp::carp("Constant name '$name' should " .
-		    "have an initial capital letter");
 	    } else {
 		# Catch-all - what did I miss? If you get this error,
 		# please let me know what your constant's name was.
 		# Write to <rootbeer@redcat.com>. Thanks!
-		Carp::carp("Constant name '$name' has unknown problems");
+		warnings::warn("Constant name '$name' has unknown problems");
 	    }
 	}