Merge branch 'master' into release/0.9922

Author: John Peacock

.gitignore

@@ -7,6 +7,7 @@
 *.pm.tdy
 *.bs
 *~
+*orig
 
 # Devel::Cover
 cover_db/

Makefile.PL

@@ -16,7 +16,8 @@ to support an earlier Perl release.
 EOL
 }
 
-use vars qw ($no_xs $force_xs);
+my ($no_xs, $force_xs);
+
 unlink 'pm_to_blib'; # belts and braces
 
 if ($ENV{PERL_ONLY}) {

lib/version.pm

@@ -8,10 +8,9 @@ if ($] >= 5.015) {
     warnings::register_categories(qw/version/);
 }
 
-use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
-
-$VERSION = 0.9922;
-$CLASS = 'version';
+our $VERSION = 0.9922;
+our $CLASS = 'version';
+our (@ISA, $STRICT, $LAX);
 
 # !!!!Delete this next block completely when adding to Perl core!!!!
 {

lib/version/regex.pm

@@ -2,13 +2,7 @@ package version::regex;
 
 use strict;
 
-use vars qw(
-    $VERSION $CLASS $STRICT $LAX
-    $STRICT_DECIMAL_VERSION $STRICT_DOTTED_DECIMAL_VERSION
-    $LAX_DECIMAL_VERSION $LAX_DOTTED_DECIMAL_VERSION
-);
-
-$VERSION = 0.9922;
+our $VERSION = 0.9922;
 
 #--------------------------------------------------------------------------#
 # Version regexp components
@@ -61,19 +55,19 @@ my $LAX_ALPHA_PART = qr/_[0-9]+/;
 
 # Strict decimal version number.
 
-$STRICT_DECIMAL_VERSION =
+our $STRICT_DECIMAL_VERSION =
     qr/ $STRICT_INTEGER_PART $FRACTION_PART? /x;
 
 # Strict dotted-decimal version number.  Must have both leading "v" and
 # at least three parts, to avoid confusion with decimal syntax.
 
-$STRICT_DOTTED_DECIMAL_VERSION =
+our $STRICT_DOTTED_DECIMAL_VERSION =
     qr/ v $STRICT_INTEGER_PART $STRICT_DOTTED_DECIMAL_PART{2,} /x;
 
 # Complete strict version number syntax -- should generally be used
 # anchored: qr/ \A $STRICT \z /x
 
-$STRICT =
+our $STRICT =
     qr/ $STRICT_DECIMAL_VERSION | $STRICT_DOTTED_DECIMAL_VERSION /x;
 
 #--------------------------------------------------------------------------#
@@ -84,7 +78,7 @@ $STRICT =
 # allowing an alpha suffix or allowing a leading or trailing
 # decimal-point
 
-$LAX_DECIMAL_VERSION =
+our $LAX_DECIMAL_VERSION =
     qr/ $LAX_INTEGER_PART (?: $FRACTION_PART | \. )? $LAX_ALPHA_PART?
 	|
 	$FRACTION_PART $LAX_ALPHA_PART?
@@ -96,7 +90,7 @@ $LAX_DECIMAL_VERSION =
 # enough, without the leading "v", Perl takes .1.2 to mean v0.1.2,
 # so when there is no "v", the leading part is optional
 
-$LAX_DOTTED_DECIMAL_VERSION =
+our $LAX_DOTTED_DECIMAL_VERSION =
     qr/
 	v $LAX_INTEGER_PART (?: $LAX_DOTTED_DECIMAL_PART+ $LAX_ALPHA_PART? )?
 	|
@@ -109,7 +103,7 @@ $LAX_DOTTED_DECIMAL_VERSION =
 # The string 'undef' is a special case to make for easier handling
 # of return values from ExtUtils::MM->parse_version
 
-$LAX =
+our $LAX =
     qr/ undef | $LAX_DOTTED_DECIMAL_VERSION | $LAX_DECIMAL_VERSION /x;
 
 #--------------------------------------------------------------------------#

t/02derived.t

@@ -51,8 +51,7 @@ print $fh <<"EOF";
 # This is an empty subclass
 package $package;
 use parent 'version';
-use vars '\$VERSION';
-\$VERSION=0.001;
+our \$VERSION = 0.001;
 EOF
 close $fh;
 

vperl/vpp.pm

@@ -122,9 +122,11 @@ use strict;
 use warnings::register;
 
 use Config;
-use vars qw($VERSION $CLASS @ISA $LAX $STRICT $WARN_CATEGORY);
-$VERSION = 0.9922;
-$CLASS = 'version::vpp';
+
+our $VERSION = 0.9922;
+our $CLASS = 'version::vpp';
+our ($LAX, $STRICT, $WARN_CATEGORY);
+
 if ($] > 5.015) {
     warnings::register_categories(qw/version/);
     $WARN_CATEGORY = 'version';

vutil/.gitignore

@@ -0,0 +1 @@
+vxs.c

vutil/lib/version/vxs.pm

@@ -4,9 +4,9 @@ package version::vxs;
 use v5.10;
 use strict;
 
-use vars qw(@ISA $VERSION $CLASS );
-$VERSION = 0.9922;
-$CLASS = 'version::vxs';
+our $VERSION = 0.9922;
+our $CLASS = 'version::vxs';
+our @ISA;
 
 eval {
     require XSLoader;