summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Bowers <neilb@neilb.org>2022-08-20 10:18:26 +0100
committerKarl Williamson <khw@cpan.org>2022-08-20 14:12:28 -0600
commitd589be28e06652966250097cee26365c4efc6f61 (patch)
tree1f5dcf9e207289a585f5fd27b69e6f11a8faddf5
parent9799861e641b722c6a1892acaaa9dac99d894256 (diff)
downloadperl-d589be28e06652966250097cee26365c4efc6f61.tar.gz
Import Scalar-Util 1.63 from CPAN
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Scalar-List-Utils/ListUtil.xs4
-rw-r--r--cpan/Scalar-List-Utils/lib/List/Util.pm2
-rw-r--r--cpan/Scalar-List-Utils/lib/List/Util/XS.pm2
-rw-r--r--cpan/Scalar-List-Utils/lib/Scalar/Util.pm6
-rw-r--r--cpan/Scalar-List-Utils/lib/Sub/Util.pm2
-rw-r--r--cpan/Scalar-List-Utils/t/exotic_names.t4
7 files changed, 11 insertions, 11 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 15db42e9d2..a448e3c3db 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1017,7 +1017,7 @@ use File::Glob qw(:case);
},
'Scalar::Util' => {
- 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.62.tar.gz',
+ 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.63.tar.gz',
'FILES' => q[cpan/Scalar-List-Utils],
},
diff --git a/cpan/Scalar-List-Utils/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs
index 16a34ec748..a4790ddd0f 100644
--- a/cpan/Scalar-List-Utils/ListUtil.xs
+++ b/cpan/Scalar-List-Utils/ListUtil.xs
@@ -800,12 +800,12 @@ PPCODE:
}
}
- if ( end < start ) {
+ if ( end <= start ) {
XSRETURN(0);
}
else {
EXTEND( SP, end - start );
- for ( i = start; i <= end; i++ ) {
+ for ( i = start; i < end; i++ ) {
PUSHs( sv_2mortal( newSVsv( ST(i) ) ) );
}
XSRETURN( end - start );
diff --git a/cpan/Scalar-List-Utils/lib/List/Util.pm b/cpan/Scalar-List-Utils/lib/List/Util.pm
index a03b298314..3766b06d89 100644
--- a/cpan/Scalar-List-Utils/lib/List/Util.pm
+++ b/cpan/Scalar-List-Utils/lib/List/Util.pm
@@ -16,7 +16,7 @@ our @EXPORT_OK = qw(
sample shuffle uniq uniqint uniqnum uniqstr zip zip_longest zip_shortest mesh mesh_longest mesh_shortest
head tail pairs unpairs pairkeys pairvalues pairmap pairgrep pairfirst
);
-our $VERSION = "1.62";
+our $VERSION = "1.63";
our $XS_VERSION = $VERSION;
$VERSION =~ tr/_//d;
diff --git a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm
index 1be196073c..28cf6928f4 100644
--- a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm
+++ b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use List::Util;
-our $VERSION = "1.62"; # FIXUP
+our $VERSION = "1.63"; # FIXUP
$VERSION =~ tr/_//d; # FIXUP
1;
diff --git a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm
index 984ccdde91..760e641ebf 100644
--- a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm
+++ b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm
@@ -17,7 +17,7 @@ our @EXPORT_OK = qw(
dualvar isdual isvstring looks_like_number openhandle readonly set_prototype
tainted
);
-our $VERSION = "1.62";
+our $VERSION = "1.63";
$VERSION =~ tr/_//d;
require List::Util; # List::Util loads the XS
@@ -145,7 +145,7 @@ on these but C<reftype()> will return the underlying C structure type of
C<"REGEXP"> in all capitals.
I<Since Perl version 5.35.7> an equivalent function is available as
-C<builtin::refaddr>.
+C<builtin::reftype>.
=head2 weaken
@@ -230,7 +230,7 @@ B<NOTE>: Copying a weak reference creates a normal, strong, reference.
$weak = isweak($copy); # false
I<Since Perl version 5.35.7> an equivalent function is available as
-C<builtin::isweak>.
+C<builtin::is_weak>.
=head1 OTHER FUNCTIONS
diff --git a/cpan/Scalar-List-Utils/lib/Sub/Util.pm b/cpan/Scalar-List-Utils/lib/Sub/Util.pm
index 573d920a76..f96e857c28 100644
--- a/cpan/Scalar-List-Utils/lib/Sub/Util.pm
+++ b/cpan/Scalar-List-Utils/lib/Sub/Util.pm
@@ -15,7 +15,7 @@ our @EXPORT_OK = qw(
subname set_subname
);
-our $VERSION = "1.62";
+our $VERSION = "1.63";
$VERSION =~ tr/_//d;
require List::Util; # as it has the XS
diff --git a/cpan/Scalar-List-Utils/t/exotic_names.t b/cpan/Scalar-List-Utils/t/exotic_names.t
index 3c5f212325..c51114a6ac 100644
--- a/cpan/Scalar-List-Utils/t/exotic_names.t
+++ b/cpan/Scalar-List-Utils/t/exotic_names.t
@@ -40,8 +40,8 @@ sub caller3_ok {
),
(
$ord > 255 ? unpack('H*', pack 'C0U', $ord )
- : ($ord > 0x1f and $ord < 0x7f) ? sprintf "%c", $ord
- : sprintf '\%o', $ord
+ : (chr $ord =~ /[[:print:]]/) ? sprintf "%c", $ord
+ : sprintf '\%o', $ord
),
);