In perl.git, the branch maint-5.22 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/ad5de5ac637094e4afcf8b206056a9202288aa76?hp=fcec72c1e34238bcdafd034e46cebf3eab65c8ec>
- Log ----------------------------------------------------------------- commit ad5de5ac637094e4afcf8b206056a9202288aa76 Author: Steve Hay <[email protected]> Date: Wed Sep 30 13:48:19 2015 +0100 POSIX $VERSION++ for previous cherry-pick (Blead was bumped to 1.57 by commit 1dd11b288e, but has several other changes that aren't in maint-5.22. So bump to an _01 number here since the intervening numbers (1.54/1.55/1.56) have already been used and it wouldn't be wise to use 1.58 since blead will naturally use that in due course.) M ext/POSIX/lib/POSIX.pm commit d68af7d29f32d6e258162576b741e3901f5b5130 Author: Jarkko Hietaniemi <[email protected]> Date: Wed Sep 30 13:41:05 2015 +0100 POSIX: mention the Inf, NaN constants; other small tweaks (cherry picked from commit d7a0f0b000f94080cd0cb5efd28ae4b26f084294) M ext/POSIX/lib/POSIX.pod commit 732b9e4634e655c94c4fe229a692ec652d8a0f70 Author: Jarkko Hietaniemi <[email protected]> Date: Thu Oct 23 20:54:33 2014 -0400 There's no READ_UINT32. (relic of some earlier code?) (cherry picked from commit 8757ed9b11519b7220e61e4765e36bd68345b6ec) M hv_func.h commit 096de731b887d877aa7541b50a5c30e4fe8e965d Author: Jarkko Hietaniemi <[email protected]> Date: Sat Jul 25 13:32:25 2015 -0400 Comment detypos. (cherry picked from commit 21ac16fed6668df441c18d5b3777df12ec41e0f8) M hv_func.h commit 8261af90a82cd1c29ce0f4f25a14e4415c6ea27d Author: Jarkko Hietaniemi <[email protected]> Date: Tue Jun 23 23:33:23 2015 -0400 Make the LoTR quote of reentr.c formatted more like the others. (Note: the p.260 is my best estimate since I don't have the same edition as tchrist) (cherry picked from commit 23ce015ee1c88f507f078091298d020d5e22a300) M reentr.c M regen/reentr.pl commit b2c3a90642ba76978ed44c10c9ff53eb8646c241 Author: Steve Hay <[email protected]> Date: Wed Sep 30 13:32:07 2015 +0100 Storable $VERSION++ for previous cherry-pick (Blead had already been bumped to 2.54 by commit 4b59afe630; we need a different number from that since we're lacking at least commit fb086a0950 in maint-5.22. Blead will naturally get bumped to 2.55 at some point in the future so it wouldn't be wise to choose that, so use an _01 number as we often have to do for maint releases in these cases.) M dist/Storable/Storable.pm commit 5d2d1c02f73fb9d5844602d328b7b73f461a79bb Author: Jarkko Hietaniemi <[email protected]> Date: Fri Jul 3 10:34:39 2015 -0400 gcc 5.1.0 thinks RETVAL might end up unset. (cherry picked from commit 3c9658f5b74001ff66c07d06d2c7f2a0741bd160) M dist/Storable/Storable.xs commit 802475c8d28a32d1dfca9e93e7c06560c1483093 Author: Aaron Crane <[email protected]> Date: Mon Jun 29 16:55:14 2015 +0100 sv_vcatpvfn_flags(): no "redundant arg" warnings for '%*2$d' This addresses RT#125469: if the format string uses an explicit index for a field width, that should suppress any "redundant argument" warnings, in just the same way as an explicit index does when used to specify a format argument. Blead has a more careful reworking of the way printf warnings work, but that change is unsuitable for maint, as it can lead to additional warnings being emitted for some invalid format strings. This smaller change ensures that maint (5.22.1-to-be) always emits strictly fewer warnings than 5.22.0. (cherry picked from commit ddd5feee1fd3e7105e11f3266509b916b9d16e55) M sv.c M t/op/sprintf.t ----------------------------------------------------------------------- Summary of changes: dist/Storable/Storable.pm | 2 +- dist/Storable/Storable.xs | 1 + ext/POSIX/lib/POSIX.pm | 2 +- ext/POSIX/lib/POSIX.pod | 32 +++++++++++++++++++++++++++----- hv_func.h | 8 +++----- reentr.c | 8 +++++++- regen/reentr.pl | 8 +++++++- sv.c | 7 +++++-- t/op/sprintf.t | 9 +++++---- 9 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dist/Storable/Storable.pm b/dist/Storable/Storable.pm index 9d8b621..bd0632f 100644 --- a/dist/Storable/Storable.pm +++ b/dist/Storable/Storable.pm @@ -22,7 +22,7 @@ package Storable; @ISA = qw(Exporter); use vars qw($canonical $forgive_me $VERSION); -$VERSION = '2.53'; +$VERSION = '2.53_01'; BEGIN { if (eval { local $SIG{__DIE__}; require Log::Agent; 1 }) { diff --git a/dist/Storable/Storable.xs b/dist/Storable/Storable.xs index 39f3565..d518117 100644 --- a/dist/Storable/Storable.xs +++ b/dist/Storable/Storable.xs @@ -6668,6 +6668,7 @@ SV * obj ALIAS: net_mstore = 1 CODE: + RETVAL = &PL_sv_undef; if (!do_store(aTHX_ (PerlIO*) 0, obj, 0, ix, &RETVAL)) RETVAL = &PL_sv_undef; OUTPUT: diff --git a/ext/POSIX/lib/POSIX.pm b/ext/POSIX/lib/POSIX.pm index 96156bf..af416b5 100644 --- a/ext/POSIX/lib/POSIX.pm +++ b/ext/POSIX/lib/POSIX.pm @@ -4,7 +4,7 @@ use warnings; our ($AUTOLOAD, %SIGRT); -our $VERSION = '1.53'; +our $VERSION = '1.53_01'; require XSLoader; diff --git a/ext/POSIX/lib/POSIX.pod b/ext/POSIX/lib/POSIX.pod index d9e84b4..0ca7bb7 100644 --- a/ext/POSIX/lib/POSIX.pod +++ b/ext/POSIX/lib/POSIX.pod @@ -444,7 +444,7 @@ C<FE_TONEAREST> is like L</round>, C<FE_TOWARDZERO> is like L</trunc> [C99]. =item C<fesetround> -Sets the floating point rounding mode, see L</fegetround>. +Sets the floating point rounding mode, see L</fegetround> [C99]. =item C<fma> @@ -504,7 +504,10 @@ Returns one of FP_NORMAL FP_ZERO FP_SUBNORMAL FP_INFINITE FP_NAN -telling the class of the argument [C99]. +telling the class of the argument [C99]. C<FP_INFINITE> is positive +or negative infinity, C<FP_NAN> is not-a-number. C<FP_SUBNORMAL> +means subnormal numbers (also known as denormals), very small numbers +with low precision. C<FP_ZERO> is zero. C<FP_NORMAL> is all the rest. =item C<fprintf> @@ -687,6 +690,16 @@ For example C<ilogb(20)> is 4, as an integer. See also L</logb>. +=item C<Inf> + +The infinity as a constant: + + use POSIX qw(Inf); + my $pos_inf = +Inf; # Or just Inf. + my $neg_inf = -Inf; + +See also L</isinf>, and L</fpclassify>. + =item C<isalnum> Deprecated function whose use raises a warning, and which is slated to @@ -796,7 +809,7 @@ Floating point comparisons which handle the C<NaN> [C99]. Returns true if the argument is an infinity (positive or negative) [C99]. -See also L</isnan>, L</isfinite>, and L</fpclassify>. +See also L</Inf>, L</isnan>, L</isfinite>, and L</fpclassify>. =item C<islower> @@ -826,7 +839,7 @@ Note that you cannot test for "C<NaN>-ness" with since the C<NaN> is not equivalent to anything, B<including itself>. -See also L</nan>, L</isinf>, and L</fpclassify>. +See also L</nan>, L</NaN>, L</isinf>, and L</fpclassify>. =item C<isnormal> @@ -1191,11 +1204,20 @@ Return the integral and fractional parts of a floating-point number. See also L</round>. +=item C<NaN> + +The not-a-number as a constant: + + use POSIX qw(NaN); + my $nan = NaN; + +See also L</nan>, C</isnan>, and L</fpclassify>. + =item C<nan> Returns not-a-number [C99]. -See also L</isnan>. +See also L</isnan> and L</NaN>. =item C<nearbyint> diff --git a/hv_func.h b/hv_func.h index 708c6c7..d4847d5 100644 --- a/hv_func.h +++ b/hv_func.h @@ -100,7 +100,7 @@ * are only needed to help derive these 3. * * U8TO32_LE(x) Read a little endian unsigned 32-bit int - * UNALIGNED_SAFE Defined if READ_UINT32 works on non-word boundaries + * UNALIGNED_SAFE Defined if unaligned access is safe * ROTL32(x,r) Rotate x left by r bits */ @@ -114,8 +114,6 @@ +((const U8 *)(d))[0]) #endif - -/* Now find best way we can to READ_UINT32 */ #if (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) && U32SIZE == 4 /* CPU endian matches murmurhash algorithm, so read 32-bit word directly */ #define U8TO32_LE(ptr) (*((U32*)(ptr))) @@ -570,7 +568,7 @@ S_perl_hash_old_one_at_a_time(const unsigned char * const seed, const unsigned c return a 32 bit hash. Note uses unaligned 64 bit loads - will NOT work on machines with - strict alginment requirements. + strict alignment requirements. Also this code may not be suitable for big-endian machines. */ @@ -628,7 +626,7 @@ S_perl_hash_murmur_hash_64a (const unsigned char * const seed, const unsigned ch a 32 bit value Note uses unaligned 32 bit loads - will NOT work on machines with - strict alginment requirements. + strict alignment requirements. Also this code may not be suitable for big-endian machines. */ diff --git a/reentr.c b/reentr.c index 9a10dca..c464acc 100644 --- a/reentr.c +++ b/reentr.c @@ -10,10 +10,16 @@ * !!!!!!! DO NOT EDIT THIS FILE !!!!!!! * This file is built by regen/reentr.pl from data in regen/reentr.pl. * Any changes made here will be lost! - * + */ + +/* * "Saruman," I said, standing away from him, "only one hand at a time can * wield the One, and you know that well, so do not trouble to say we!" * + * [p.260 of _The Lord of the Rings_, II/ii: "The Council of Elrond"] + */ + +/* * This file contains a collection of automatically created wrappers * (created by running reentr.pl) for reentrant (thread-safe) versions of * various library calls, such as getpwent_r. The wrapping is done so diff --git a/regen/reentr.pl b/regen/reentr.pl index f22f085..3a0afaf 100644 --- a/regen/reentr.pl +++ b/regen/reentr.pl @@ -748,10 +748,16 @@ read_only_bottom_close_and_rename($h); # Prepare to write the reentr.c. my $c = open_print_header('reentr.c', <<'EOQ'); - * + */ + +/* * "Saruman," I said, standing away from him, "only one hand at a time can * wield the One, and you know that well, so do not trouble to say we!" * + * [p.260 of _The Lord of the Rings_, II/ii: "The Council of Elrond"] + */ + +/* * This file contains a collection of automatically created wrappers * (created by running reentr.pl) for reentrant (thread-safe) versions of * various library calls, such as getpwent_r. The wrapping is done so diff --git a/sv.c b/sv.c index 7dc55d1..e0ef0e7 100644 --- a/sv.c +++ b/sv.c @@ -11526,9 +11526,12 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p tryasterisk: if (*q == '*') { q++; - if ( (ewix = expect_number(&q)) ) - if (*q++ != '$') + if ( (ewix = expect_number(&q)) ) { + if (*q++ == '$') + no_redundant_warning = TRUE; + else goto unknown; + } asterisk = TRUE; } if (*q == 'v') { diff --git a/t/op/sprintf.t b/t/op/sprintf.t index 967b5d3..e6ef617 100644 --- a/t/op/sprintf.t +++ b/t/op/sprintf.t @@ -647,19 +647,20 @@ __END__ >%y< >''< >%y INVALID REDUNDANT< >%z< >''< >%z INVALID REDUNDANT< >%2$d %1$d< >[12, 34]< >34 12< ->%*2$d< >[12, 3]< > 12 REDUNDANT< +>%*2$d< >[12, 3]< > 12< >RT#125469< +>%*3$d< >[12, 9, 3]< > 12< >related to RT#125469< >%2$d %d< >[12, 34]< >34 12< >%2$d %d %d< >[12, 34]< >34 12 34< >%3$d %d %d< >[12, 34, 56]< >56 12 34< >%2$*3$d %d< >[12, 34, 3]< > 34 12< ->%*3$2$d %d< >[12, 34, 3]< >%*3$2$d 12 INVALID REDUNDANT< +>%*3$2$d %d< >[12, 34, 3]< >%*3$2$d 12 INVALID< >%2$d< >12< >0 MISSING< >%0$d< >12< >%0$d INVALID REDUNDANT< >%1$$d< >12< >%1$$d INVALID< >%1$1$d< >12< >%1$1$d INVALID< ->%*2$*2$d< >[12, 3]< >%*2$*2$d INVALID REDUNDANT< +>%*2$*2$d< >[12, 3]< >%*2$*2$d INVALID< >%*2*2$d< >[12, 3]< >%*2*2$d INVALID REDUNDANT< ->%*2$1d< >[12, 3]< >%*2$1d INVALID REDUNDANT< +>%*2$1d< >[12, 3]< >%*2$1d INVALID< >%0v2.2d< >''< >< >%vc,%d< >[63, 64, 65]< >%vc,63 INVALID REDUNDANT< >%v%,%d< >[63, 64, 65]< >%v%,63 INVALID REDUNDANT< -- Perl5 Master Repository
