In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/a684213360784beeff22665b3da443d7b86e26cc?hp=fbb64cf55d4ec47a6b340862d7902f06b7a1ddc8>
- Log -----------------------------------------------------------------
commit a684213360784beeff22665b3da443d7b86e26cc
Author: John Peacock <jpeac...@cpan.org>
Date: Sun Apr 15 21:19:38 2018 -0400
Synch cpan/version/* and other files with CPAN version 0.9923.
Per recommendation of Karl Williamson. Used this program to perform
synchronization:
https://github.com/jkeenan/scripts-misc/blob/master/sync-version-pm.pl
-----------------------------------------------------------------------
Summary of changes:
cpan/version/lib/version.pm | 7 +++----
cpan/version/lib/version/regex.pm | 20 +++++++-------------
cpan/version/t/01base.t | 2 +-
cpan/version/t/02derived.t | 5 ++---
cpan/version/t/03require.t | 2 +-
cpan/version/t/05sigdie.t | 2 +-
cpan/version/t/06noop.t | 2 +-
cpan/version/t/07locale.t | 2 +-
cpan/version/t/08_corelist.t | 2 +-
cpan/version/t/09_list_util.t | 2 +-
t/porting/customized.dat | 2 +-
vutil.c | 8 ++++----
12 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/cpan/version/lib/version.pm b/cpan/version/lib/version.pm
index 100bd03909..66d44be63d 100644
--- a/cpan/version/lib/version.pm
+++ b/cpan/version/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.9921;
-$CLASS = 'version';
+our $VERSION = 0.9923;
+our $CLASS = 'version';
+our (@ISA, $STRICT, $LAX);
# avoid using Exporter
require version::regex;
diff --git a/cpan/version/lib/version/regex.pm
b/cpan/version/lib/version/regex.pm
index 77d54512ed..4e44d12c93 100644
--- a/cpan/version/lib/version/regex.pm
+++ b/cpan/version/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.9921;
+our $VERSION = 0.9923;
#--------------------------------------------------------------------------#
# 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;
#--------------------------------------------------------------------------#
diff --git a/cpan/version/t/01base.t b/cpan/version/t/01base.t
index 608dc52f0b..9c3862db39 100644
--- a/cpan/version/t/01base.t
+++ b/cpan/version/t/01base.t
@@ -14,7 +14,7 @@ BEGIN {
)
);
require $coretests;
- use_ok('version', 0.9921);
+ use_ok('version', 0.9923);
}
BaseTests("version","new","qv");
diff --git a/cpan/version/t/02derived.t b/cpan/version/t/02derived.t
index f3d3ffe173..151f66cc20 100644
--- a/cpan/version/t/02derived.t
+++ b/cpan/version/t/02derived.t
@@ -15,7 +15,7 @@ BEGIN {
)
);
require $coretests;
- use_ok("version", 0.9921);
+ use_ok("version", 0.9923);
# If we made it this far, we are ok.
}
@@ -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;
diff --git a/cpan/version/t/03require.t b/cpan/version/t/03require.t
index 4146d303c1..c6f67d50ac 100644
--- a/cpan/version/t/03require.t
+++ b/cpan/version/t/03require.t
@@ -19,7 +19,7 @@ BEGIN {
# Don't want to use, because we need to make sure that the import doesn't
# fire just yet (some code does this to avoid importing qv() and delare()).
require_ok("version");
-is $version::VERSION, 0.9921, "Make sure we have the correct class";
+is $version::VERSION, 0.9923, "Make sure we have the correct class";
ok(!"main"->can("qv"), "We don't have the imported qv()");
ok(!"main"->can("declare"), "We don't have the imported declare()");
diff --git a/cpan/version/t/05sigdie.t b/cpan/version/t/05sigdie.t
index c9eecae766..e979eced20 100644
--- a/cpan/version/t/05sigdie.t
+++ b/cpan/version/t/05sigdie.t
@@ -14,7 +14,7 @@ BEGIN {
}
BEGIN {
- use version 0.9921;
+ use version 0.9923;
}
pass "Didn't get caught by the wrong DIE handler, which is a good thing";
diff --git a/cpan/version/t/06noop.t b/cpan/version/t/06noop.t
index 25f12c6010..a34762e18d 100644
--- a/cpan/version/t/06noop.t
+++ b/cpan/version/t/06noop.t
@@ -7,7 +7,7 @@
use Test::More qw/no_plan/;
BEGIN {
- use_ok('version', 0.9921);
+ use_ok('version', 0.9923);
}
my $v1 = version->new('1.2');
diff --git a/cpan/version/t/07locale.t b/cpan/version/t/07locale.t
index 8ac74a6e4f..79b22abe57 100644
--- a/cpan/version/t/07locale.t
+++ b/cpan/version/t/07locale.t
@@ -11,7 +11,7 @@ use Test::More tests => 8;
use Config;
BEGIN {
- use_ok('version', 0.9921);
+ use_ok('version', 0.9923);
}
SKIP: {
diff --git a/cpan/version/t/08_corelist.t b/cpan/version/t/08_corelist.t
index 88a3724693..638b290936 100644
--- a/cpan/version/t/08_corelist.t
+++ b/cpan/version/t/08_corelist.t
@@ -5,7 +5,7 @@
#########################
use Test::More tests => 3;
-use_ok("version", 0.9921);
+use_ok("version", 0.9923);
# do strict lax tests in a sub to isolate a package to test importing
SKIP: {
diff --git a/cpan/version/t/09_list_util.t b/cpan/version/t/09_list_util.t
index 6a420665d6..34e47dce8f 100644
--- a/cpan/version/t/09_list_util.t
+++ b/cpan/version/t/09_list_util.t
@@ -4,7 +4,7 @@
#########################
use strict;
-use_ok("version", 0.9921);
+use_ok("version", 0.9923);
use Test::More;
BEGIN {
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index 06ecd96189..cd22555da0 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -27,5 +27,5 @@ experimental cpan/experimental/t/basic.t
a073ea03ccc98dec496569f3648ab01a5fe1c7a
perlfaq cpan/perlfaq/lib/perlfaq5.pod bcc1b6af3b6dff3973643acf8d5e741463374123
perlfaq cpan/perlfaq/lib/perlfaq8.pod bffbc0c8fa828aead24e0891a5e789369a8e0743
podlators pod/perlpodstyle.pod c6500c9950b46e8228d4adbc09a3ee2ef23de2d0
-version cpan/version/lib/version.pm 2325ac992f0be9d765b558a2162ca13a46de256f
+version cpan/version/lib/version.pm a61f969d55dd73ae2d7a604f2c9bbef1ea82b820
version vxs.inc f26c23f0279fb64c77ad814af906c04930cff81c
diff --git a/vutil.c b/vutil.c
index a3f11bee60..5d183a0f29 100644
--- a/vutil.c
+++ b/vutil.c
@@ -693,12 +693,12 @@ VER_NV:
#endif
if (sv) {
- Perl_sv_catpvf(aTHX_ sv, "%.9"NVff, SvNVX(ver));
+ Perl_sv_catpvf(aTHX_ sv, "%.9" NVff, SvNVX(ver));
len = SvCUR(sv);
buf = SvPVX(sv);
}
else {
- len = my_snprintf(tbuf, sizeof(tbuf), "%.9"NVff, SvNVX(ver));
+ len = my_snprintf(tbuf, sizeof(tbuf), "%.9" NVff, SvNVX(ver));
buf = tbuf;
}
@@ -989,11 +989,11 @@ Perl_vnormal(pTHX_ SV *vs)
SV * tsv = *av_fetch(av, 0, 0);
digit = SvIV(tsv);
}
- sv = Perl_newSVpvf(aTHX_ "v%"IVdf, (IV)digit);
+ sv = Perl_newSVpvf(aTHX_ "v%" IVdf, (IV)digit);
for ( i = 1 ; i <= len ; i++ ) {
SV * tsv = *av_fetch(av, i, 0);
digit = SvIV(tsv);
- Perl_sv_catpvf(aTHX_ sv, ".%"IVdf, (IV)digit);
+ Perl_sv_catpvf(aTHX_ sv, ".%" IVdf, (IV)digit);
}
if ( len <= 2 ) { /* short version, must be at least three */
--
Perl5 Master Repository
