In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/745002c984ddd273ac0b9268d17a1d1a2660805d?hp=ac9fc527315f1c14bccf21fd437798e4f7517514>
- Log ----------------------------------------------------------------- commit 745002c984ddd273ac0b9268d17a1d1a2660805d Author: Rafael Garcia-Suarez <[email protected]> Date: Wed Oct 21 19:34:06 2009 +0200 Bump base and fields versions to 2.15 M Porting/Maintainers.pl M dist/base/Changes M dist/base/META.yml M dist/base/lib/base.pm M dist/base/lib/fields.pm commit 7c8178a1ff9cacd9d60d7ce9a16d7e59a0bbefff Author: Rafael Garcia-Suarez <[email protected]> Date: Wed Oct 21 19:07:09 2009 +0200 Fix built-in prototype of each, keys, and values Since those keywords can now compile to two different ops each, the usual inspection of opflags is not sufficient for perl to return a meaningful prototype. So we hardcode the correct return value for 5.12 : \...@%] M pp.c M t/op/cproto.t ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- dist/base/Changes | 3 +++ dist/base/META.yml | 2 +- dist/base/lib/base.pm | 2 +- dist/base/lib/fields.pm | 2 +- pp.c | 4 ++++ t/op/cproto.t | 6 +++--- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 6bff96a..29adc2b 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -289,7 +289,7 @@ use File::Glob qw(:case); 'base' => { 'MAINTAINER' => 'rgarcia', - 'DISTRIBUTION' => 'RGARCIA/base-2.14.tar.gz', + 'DISTRIBUTION' => 'RGARCIA/base-2.15.tar.gz', 'FILES' => q[dist/base], 'CPAN' => 1, 'UPSTREAM' => 'blead', diff --git a/dist/base/Changes b/dist/base/Changes index 12d615c..6dda10b 100644 --- a/dist/base/Changes +++ b/dist/base/Changes @@ -1,3 +1,6 @@ +2.15 + - Bump version to 2.15 so base and fields have the same version again + 2.14 - fix problem with SIGDIE on perls < 5.10 - Make @INC available in base.pm's error message when diff --git a/dist/base/META.yml b/dist/base/META.yml index df139a1..0a91128 100644 --- a/dist/base/META.yml +++ b/dist/base/META.yml @@ -1,6 +1,6 @@ --- #YAML:1.0 name: base -version: 2.14 +version: 2.15 abstract: ~ license: ~ author: ~ diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm index 574925f..2f6a19e 100644 --- a/dist/base/lib/base.pm +++ b/dist/base/lib/base.pm @@ -2,7 +2,7 @@ package base; use strict 'vars'; use vars qw($VERSION); -$VERSION = '2.14'; +$VERSION = '2.15'; $VERSION = eval $VERSION; # constant.pm is slow diff --git a/dist/base/lib/fields.pm b/dist/base/lib/fields.pm index c90bc0a..de6f379 100644 --- a/dist/base/lib/fields.pm +++ b/dist/base/lib/fields.pm @@ -11,7 +11,7 @@ unless( eval q{require warnings::register; warnings::register->import; 1} ) { } use vars qw(%attr $VERSION); -$VERSION = '2.14'; +$VERSION = '2.15'; # constant.pm is slow sub PUBLIC () { 2**0 } diff --git a/pp.c b/pp.c index 078db3b..6f56368 100644 --- a/pp.c +++ b/pp.c @@ -422,6 +422,10 @@ PP(pp_prototype) ret = newSVpvs_flags("_;$", SVs_TEMP); goto set; } + if (code == -KEY_keys || code == -KEY_values || code == -KEY_each) { + ret = newSVpvs_flags("\...@%]", SVs_TEMP); + goto set; + } if (code == -KEY_readpipe) { s = "CORE::backtick"; } diff --git a/t/op/cproto.t b/t/op/cproto.t index cc2426a..af1555f 100644 --- a/t/op/cproto.t +++ b/t/op/cproto.t @@ -57,7 +57,7 @@ delete undef die (@) do undef dump () -each (\%) +each (\...@%]) else undef elsif undef endgrent () @@ -120,7 +120,7 @@ index ($$;$) int (_) ioctl (*$$) join ($@) -keys (\%) +keys (\...@%]) kill (@) last undef lc (_) @@ -252,7 +252,7 @@ untie undef until undef use undef utime (@) -values (\%) +values (\...@%]) vec ($$$) wait () waitpid ($$) -- Perl5 Master Repository
