Skip to content

Commit d174c09

Browse files
leonerdjkeenan
leonerd
authored and
jkeenan
committed
cpan/Scalar-List-Utils - Update to version 1.65
1.65 -- 2024-08-06 [BUGFIXES] * Update exotic names test to avoid single quote package separator (GH #128) * Don't loop forever in uniqnum.t (GH #130)
1 parent 4866f0f commit d174c09

File tree

9 files changed

+66
-52
lines changed

9 files changed

+66
-52
lines changed

‎MANIFEST

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,48 +2210,48 @@ cpan/podlators/t/text/utf8-io.t Test file related to podlators
22102210
cpan/Scalar-List-Utils/lib/List/Util.pm List::Util
22112211
cpan/Scalar-List-Utils/lib/List/Util/XS.pm List::Util
22122212
cpan/Scalar-List-Utils/lib/Scalar/Util.pm Scalar::Util
2213-
cpan/Scalar-List-Utils/lib/Sub/Util.pm
2213+
cpan/Scalar-List-Utils/lib/Sub/Util.pm Module related to Scalar::Util
22142214
cpan/Scalar-List-Utils/ListUtil.xs Util extension
22152215
cpan/Scalar-List-Utils/Makefile.PL Util extension
22162216
cpan/Scalar-List-Utils/multicall.h Util extension
22172217
cpan/Scalar-List-Utils/t/00version.t Scalar::Util
22182218
cpan/Scalar-List-Utils/t/any-all.t List::Util
22192219
cpan/Scalar-List-Utils/t/blessed.t Scalar::Util
22202220
cpan/Scalar-List-Utils/t/dualvar.t Scalar::Util
2221-
cpan/Scalar-List-Utils/t/exotic_names.t
2221+
cpan/Scalar-List-Utils/t/exotic_names.t Test file related to Scalar::Util
22222222
cpan/Scalar-List-Utils/t/first.t List::Util
2223-
cpan/Scalar-List-Utils/t/getmagic-once.t
2224-
cpan/Scalar-List-Utils/t/head-tail.t
2223+
cpan/Scalar-List-Utils/t/getmagic-once.t Test file related to Scalar::Util
2224+
cpan/Scalar-List-Utils/t/head-tail.t Test file related to Scalar::Util
22252225
cpan/Scalar-List-Utils/t/isvstring.t Scalar::Util
22262226
cpan/Scalar-List-Utils/t/lln.t Scalar::Util
22272227
cpan/Scalar-List-Utils/t/max.t List::Util
22282228
cpan/Scalar-List-Utils/t/maxstr.t List::Util
2229-
cpan/Scalar-List-Utils/t/mesh.t
2229+
cpan/Scalar-List-Utils/t/mesh.t Test file related to Scalar::Util
22302230
cpan/Scalar-List-Utils/t/min.t List::Util
22312231
cpan/Scalar-List-Utils/t/minstr.t List::Util
22322232
cpan/Scalar-List-Utils/t/openhan.t Scalar::Util
2233-
cpan/Scalar-List-Utils/t/pair.t
2233+
cpan/Scalar-List-Utils/t/pair.t Test file related to Scalar::Util
22342234
cpan/Scalar-List-Utils/t/product.t List::Util
2235-
cpan/Scalar-List-Utils/t/prototype.t
2235+
cpan/Scalar-List-Utils/t/prototype.t Test file related to Scalar::Util
22362236
cpan/Scalar-List-Utils/t/readonly.t Scalar::Util
22372237
cpan/Scalar-List-Utils/t/reduce.t List::Util
2238-
cpan/Scalar-List-Utils/t/reductions.t
2238+
cpan/Scalar-List-Utils/t/reductions.t Test file related to Scalar::Util
22392239
cpan/Scalar-List-Utils/t/refaddr.t Scalar::Util
22402240
cpan/Scalar-List-Utils/t/reftype.t Scalar::Util
22412241
cpan/Scalar-List-Utils/t/rt-96343.t Scalar::Util
2242-
cpan/Scalar-List-Utils/t/sample.t
2243-
cpan/Scalar-List-Utils/t/scalarutil-proto.t
2242+
cpan/Scalar-List-Utils/t/sample.t Test file related to Scalar::Util
2243+
cpan/Scalar-List-Utils/t/scalarutil-proto.t Test file related to Scalar::Util
22442244
cpan/Scalar-List-Utils/t/shuffle.t List::Util
22452245
cpan/Scalar-List-Utils/t/stack-corruption.t List::Util
2246-
cpan/Scalar-List-Utils/t/subname.t
2246+
cpan/Scalar-List-Utils/t/subname.t Test file related to Scalar::Util
22472247
cpan/Scalar-List-Utils/t/sum.t List::Util
2248-
cpan/Scalar-List-Utils/t/sum0.t
2248+
cpan/Scalar-List-Utils/t/sum0.t Test file related to Scalar::Util
22492249
cpan/Scalar-List-Utils/t/tainted.t Scalar::Util
2250-
cpan/Scalar-List-Utils/t/undefined-block.t
2250+
cpan/Scalar-List-Utils/t/undefined-block.t Test file related to Scalar::Util
22512251
cpan/Scalar-List-Utils/t/uniq.t Scalar::Util
2252-
cpan/Scalar-List-Utils/t/uniqnum.t
2252+
cpan/Scalar-List-Utils/t/uniqnum.t Test file related to Scalar::Util
22532253
cpan/Scalar-List-Utils/t/weak.t Scalar::Util
2254-
cpan/Scalar-List-Utils/t/zip.t
2254+
cpan/Scalar-List-Utils/t/zip.t Test file related to Scalar::Util
22552255
cpan/Socket/Makefile.PL Socket extension makefile writer
22562256
cpan/Socket/Socket.pm Socket extension Perl module
22572257
cpan/Socket/Socket.xs Socket extension external subroutines

‎Porting/Maintainers.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,8 @@ package Maintainers;
10021002
},
10031003

10041004
'Scalar::Util' => {
1005-
'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.63.tar.gz',
1005+
'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.65.tar.gz',
1006+
'SYNCINFO' => 'jkeenan on Wed Aug 14 21:09:49 2024',
10061007
'FILES' => q[cpan/Scalar-List-Utils],
10071008
},
10081009

‎cpan/Scalar-List-Utils/ListUtil.xs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,7 @@ CODE:
17171717
ST(0) = boolSV((SvPOK(sv) || SvPOKp(sv)) && (SvNIOK(sv) || SvNIOKp(sv)));
17181718
XSRETURN(1);
17191719

1720+
#if !PERL_VERSION_GE(5, 40, 0)
17201721
SV *
17211722
blessed(sv)
17221723
SV *sv
@@ -1820,6 +1821,8 @@ CODE:
18201821
ST(0) = boolSV(SvROK(sv) && SvWEAKREF(sv));
18211822
XSRETURN(1);
18221823

1824+
#endif /* !PERL_VERSION_GE(5, 40, 0) */
1825+
18231826
int
18241827
readonly(sv)
18251828
SV *sv
@@ -1947,10 +1950,8 @@ PREINIT:
19471950
STRLEN namelen;
19481951
const char* nameptr = SvPV(name, namelen);
19491952
int utf8flag = SvUTF8(name);
1950-
#if PERL_VERSION_LT(5, 41, 3)
19511953
int quotes_seen = 0;
19521954
bool need_subst = FALSE;
1953-
#endif
19541955
PPCODE:
19551956
if (!SvROK(sub) && SvGMAGICAL(sub))
19561957
mg_get(sub);
@@ -1973,23 +1974,18 @@ PPCODE:
19731974
if (s > nameptr && *s == ':' && s[-1] == ':') {
19741975
end = s - 1;
19751976
begin = ++s;
1976-
#if PERL_VERSION_LT(5, 41, 3)
19771977
if (quotes_seen)
19781978
need_subst = TRUE;
1979-
#endif
19801979
}
1981-
#if PERL_VERSION_LT(5, 41, 3)
19821980
else if (s > nameptr && *s != '\0' && s[-1] == '\'') {
19831981
end = s - 1;
19841982
begin = s;
19851983
if (quotes_seen++)
19861984
need_subst = TRUE;
19871985
}
1988-
#endif
19891986
}
19901987
s--;
19911988
if (end) {
1992-
#if PERL_VERSION_LT(5, 41, 3)
19931989
SV* tmp;
19941990
if (need_subst) {
19951991
STRLEN length = end - nameptr + quotes_seen - (*end == '\'' ? 1 : 0);
@@ -2009,7 +2005,6 @@ PPCODE:
20092005
stash = gv_stashpvn(left, length, GV_ADD | utf8flag);
20102006
}
20112007
else
2012-
#endif
20132008
stash = gv_stashpvn(nameptr, end - nameptr, GV_ADD | utf8flag);
20142009
nameptr = begin;
20152010
namelen -= begin - nameptr;

‎cpan/Scalar-List-Utils/Makefile.PL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ my %params = (
4141
dynamic_config => 0,
4242
resources => { ##
4343
repository => {
44-
url => 'https://github.com/Scalar-List-Utils/Scalar-List-Utils.git',
45-
web => 'https://github.com/Scalar-List-Utils/Scalar-List-Utils',
44+
url => 'https://github.com/Dual-Life/Scalar-List-Utils.git',
45+
web => 'https://github.com/Dual-Life/Scalar-List-Utils',
4646
type => 'git',
4747
},
4848
bugtracker => {

‎cpan/Scalar-List-Utils/lib/List/Util.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ our @EXPORT_OK = qw(
1616
sample shuffle uniq uniqint uniqnum uniqstr zip zip_longest zip_shortest mesh mesh_longest mesh_shortest
1717
head tail pairs unpairs pairkeys pairvalues pairmap pairgrep pairfirst
1818
);
19-
our $VERSION = "1.63_01";
19+
our $VERSION = "1.65";
2020
our $XS_VERSION = $VERSION;
2121
$VERSION =~ tr/_//d;
2222

@@ -57,7 +57,7 @@ List::Util - A selection of general-utility list subroutines
5757
5858
pairs unpairs pairkeys pairvalues pairfirst pairgrep pairmap
5959
60-
shuffle uniq uniqint uniqnum uniqstr zip mesh
60+
shuffle uniq uniqint uniqnum uniqstr head tail zip mesh
6161
);
6262
6363
=head1 DESCRIPTION
@@ -410,7 +410,7 @@ list; e.g.:
410410
I<Since version 1.29.>
411411
412412
A convenient shortcut to operating on even-sized lists of pairs, this function
413-
returns a list of the the first values of each of the pairs in the given list.
413+
returns a list of the first values of each of the pairs in the given list.
414414
It is a more efficient version of
415415
416416
@keys = pairmap { $a } @kvlist
@@ -422,7 +422,7 @@ It is a more efficient version of
422422
I<Since version 1.29.>
423423
424424
A convenient shortcut to operating on even-sized lists of pairs, this function
425-
returns a list of the the second values of each of the pairs in the given list.
425+
returns a list of the second values of each of the pairs in the given list.
426426
It is a more efficient version of
427427
428428
@values = pairmap { $b } @kvlist

‎cpan/Scalar-List-Utils/lib/List/Util/XS.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use strict;
33
use warnings;
44
use List::Util;
55

6-
our $VERSION = "1.63_01"; # FIXUP
6+
our $VERSION = "1.65"; # FIXUP
77
$VERSION =~ tr/_//d; # FIXUP
88

99
1;

‎cpan/Scalar-List-Utils/lib/Scalar/Util.pm

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,25 @@ our @EXPORT_OK = qw(
1717
dualvar isdual isvstring looks_like_number openhandle readonly set_prototype
1818
tainted
1919
);
20-
our $VERSION = "1.63_01";
20+
our $VERSION = "1.65";
2121
$VERSION =~ tr/_//d;
2222

2323
require List::Util; # List::Util loads the XS
2424
List::Util->VERSION( $VERSION ); # Ensure we got the right XS version (RT#100863)
2525

26+
if( $] >= 5.040 ) {
27+
# On Perl 5.40 and above, these builtins are stable, so we can use them
28+
# instead of our own XS implementation
29+
30+
# Using this instead of a globref means we don't create an empty
31+
# "builtins::" glob on older perls
32+
no strict 'refs';
33+
my $builtins = \%{"builtin::"};
34+
35+
*$_ = \&{ $builtins->{$_} } for (qw( blessed refaddr reftype weaken unweaken ));
36+
*isweak = \&{ $builtins->{is_weak} }; # renamed
37+
}
38+
2639
# populating @EXPORT_FAIL is done in the XS code
2740
sub export_fail {
2841
if (grep { /^isvstring$/ } @_ ) {

‎cpan/Scalar-List-Utils/lib/Sub/Util.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ our @EXPORT_OK = qw(
1515
subname set_subname
1616
);
1717

18-
our $VERSION = "1.63_01";
18+
our $VERSION = "1.65";
1919
$VERSION =~ tr/_//d;
2020

2121
require List::Util; # as it has the XS

‎cpan/Scalar-List-Utils/t/exotic_names.t

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ sub caller3_ok {
4545
),
4646
);
4747

48-
$expected =~ s/'/::/g if $] < 5.041_003;
48+
$expected =~ s/'/::/g;
4949

5050
# this is apparently how things worked before 5.16
5151
utf8::encode($expected) if $] < 5.016 and $ord > 255;
@@ -67,27 +67,32 @@ sub caller3_ok {
6767

6868
use Sub::Util 'set_subname';
6969

70-
my @ordinal = ( 1 .. 255 );
71-
72-
# 5.14 is the first perl to start properly handling \0 in identifiers
73-
unshift @ordinal, 0
74-
unless $] < 5.014;
75-
76-
# Unicode in 5.6 is not sane (crashes etc)
77-
push @ordinal,
78-
0x100, # LATIN CAPITAL LETTER A WITH MACRON
79-
0x498, # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
80-
0x2122, # TRADE MARK SIGN
81-
0x1f4a9, # PILE OF POO
82-
unless $] < 5.008;
70+
my @ordinal = (
71+
# 5.14 is the first perl to start properly handling \0 in identifiers
72+
($] >= 5.014 ? ( 0 ) : ()),
73+
1 .. 38,
74+
# single quote ' separators are deprecated in 5.37.9
75+
($] < 5.037009 ? ( 39 ) : ()),
76+
40 .. 255,
77+
# Unicode in 5.6 is not sane (crashes etc)
78+
($] >= 5.008 ? (
79+
0x100, # LATIN CAPITAL LETTER A WITH MACRON
80+
0x498, # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
81+
0x2122, # TRADE MARK SIGN
82+
0x1f4a9, # PILE OF POO
83+
) : ()),
84+
);
85+
86+
my $legal_ident_char = join('',
87+
"A-Z_a-z0-9",
88+
($] < 5.037009 ? q['] : ()),
89+
($] > 5.008 ? (
90+
map chr, 0x100, 0x498
91+
) : ()),
92+
);
8393

8494
plan tests => @ordinal * 2 * 3;
8595

86-
my $legal_ident_char = "A-Z_a-z0-9";
87-
$legal_ident_char .= "'" if $] < 5.041_003;
88-
$legal_ident_char .= join '', map chr, 0x100, 0x498
89-
unless $] < 5.008;
90-
9196
my $uniq = 'A000';
9297
for my $ord (@ordinal) {
9398
my $sub;

0 commit comments

Comments
 (0)