merge in perl 5.12.2 plus local changes

1 files changed, 41 insertions, 21 deletions

diff --git a/gnu/usr.bin/perl/opcode.h b/gnu/usr.bin/perl/opcode.h
index 5c71a5e2c3e..0849839c7a5 100644
--- a/gnu/usr.bin/perl/opcode.h
+++ b/gnu/usr.bin/perl/opcode.h
@@ -163,6 +163,9 @@ EXTCONST char* const PL_op_name[] = {
 	"aelemfast",
 	"aelem",
 	"aslice",
+	"aeach",
+	"akeys",
+	"avalues",
 	"each",
 	"values",
 	"keys",
@@ -171,6 +174,7 @@ EXTCONST char* const PL_op_name[] = {
 	"rv2hv",
 	"helem",
 	"hslice",
+	"boolkeys",
 	"unpack",
 	"pack",
 	"split",
@@ -227,7 +231,6 @@ EXTCONST char* const PL_op_name[] = {
 	"dump",
 	"goto",
 	"exit",
-	"setstate",
 	"method_named",
 	"entergiven",
 	"leavegiven",
@@ -259,8 +262,6 @@ EXTCONST char* const PL_op_name[] = {
 	"sysseek",
 	"sysread",
 	"syswrite",
-	"send",
-	"recv",
 	"eof",
 	"tell",
 	"seek",
@@ -268,6 +269,8 @@ EXTCONST char* const PL_op_name[] = {
 	"fcntl",
 	"ioctl",
 	"flock",
+	"send",
+	"recv",
 	"socket",
 	"sockpair",
 	"bind",
@@ -356,6 +359,7 @@ EXTCONST char* const PL_op_name[] = {
 	"semctl",
 	"require",
 	"dofile",
+	"hintseval",
 	"entereval",
 	"leaveeval",
 	"entertry",
@@ -532,6 +536,9 @@ EXTCONST char* const PL_op_desc[] = {
 	"constant array element",
 	"array element",
 	"array slice",
+	"each on array",
+	"keys on array",
+	"values on array",
 	"each",
 	"values",
 	"keys",
@@ -540,6 +547,7 @@ EXTCONST char* const PL_op_desc[] = {
 	"hash dereference",
 	"hash element",
 	"hash slice",
+	"boolkeys",
 	"unpack",
 	"pack",
 	"split",
@@ -596,7 +604,6 @@ EXTCONST char* const PL_op_desc[] = {
 	"dump",
 	"goto",
 	"exit",
-	"set statement info",
 	"method with known name",
 	"given()",
 	"leave given block",
@@ -628,8 +635,6 @@ EXTCONST char* const PL_op_desc[] = {
 	"sysseek",
 	"sysread",
 	"syswrite",
-	"send",
-	"recv",
 	"eof",
 	"tell",
 	"seek",
@@ -637,6 +642,8 @@ EXTCONST char* const PL_op_desc[] = {
 	"fcntl",
 	"ioctl",
 	"flock",
+	"send",
+	"recv",
 	"socket",
 	"socketpair",
 	"bind",
@@ -725,6 +732,7 @@ EXTCONST char* const PL_op_desc[] = {
 	"semctl",
 	"require",
 	"do \"file\"",
+	"eval hints",
 	"eval \"string\"",
 	"eval \"string\" exit",
 	"eval {block}",
@@ -915,6 +923,9 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_aelemfast),
 	MEMBER_TO_FPTR(Perl_pp_aelem),
 	MEMBER_TO_FPTR(Perl_pp_aslice),
+	MEMBER_TO_FPTR(Perl_pp_aeach),
+	MEMBER_TO_FPTR(Perl_pp_akeys),
+	MEMBER_TO_FPTR(Perl_pp_akeys),	/* Perl_pp_avalues */
 	MEMBER_TO_FPTR(Perl_pp_each),
 	MEMBER_TO_FPTR(Perl_do_kv),	/* Perl_pp_values */
 	MEMBER_TO_FPTR(Perl_do_kv),	/* Perl_pp_keys */
@@ -923,6 +934,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_rv2av),	/* Perl_pp_rv2hv */
 	MEMBER_TO_FPTR(Perl_pp_helem),
 	MEMBER_TO_FPTR(Perl_pp_hslice),
+	MEMBER_TO_FPTR(Perl_pp_boolkeys),
 	MEMBER_TO_FPTR(Perl_pp_unpack),
 	MEMBER_TO_FPTR(Perl_pp_pack),
 	MEMBER_TO_FPTR(Perl_pp_split),
@@ -979,7 +991,6 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_goto),	/* Perl_pp_dump */
 	MEMBER_TO_FPTR(Perl_pp_goto),
 	MEMBER_TO_FPTR(Perl_pp_exit),
-	MEMBER_TO_FPTR(Perl_pp_setstate),
 	MEMBER_TO_FPTR(Perl_pp_method_named),
 	MEMBER_TO_FPTR(Perl_pp_entergiven),
 	MEMBER_TO_FPTR(Perl_pp_leavegiven),
@@ -1011,8 +1022,6 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_sysseek),
 	MEMBER_TO_FPTR(Perl_pp_sysread),
 	MEMBER_TO_FPTR(Perl_pp_send),	/* Perl_pp_syswrite */
-	MEMBER_TO_FPTR(Perl_pp_send),
-	MEMBER_TO_FPTR(Perl_pp_sysread),	/* Perl_pp_recv */
 	MEMBER_TO_FPTR(Perl_pp_eof),
 	MEMBER_TO_FPTR(Perl_pp_tell),
 	MEMBER_TO_FPTR(Perl_pp_sysseek),	/* Perl_pp_seek */
@@ -1020,6 +1029,8 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_ioctl),	/* Perl_pp_fcntl */
 	MEMBER_TO_FPTR(Perl_pp_ioctl),
 	MEMBER_TO_FPTR(Perl_pp_flock),
+	MEMBER_TO_FPTR(Perl_pp_send),
+	MEMBER_TO_FPTR(Perl_pp_sysread),	/* Perl_pp_recv */
 	MEMBER_TO_FPTR(Perl_pp_socket),
 	MEMBER_TO_FPTR(Perl_pp_sockpair),
 	MEMBER_TO_FPTR(Perl_pp_bind),
@@ -1108,6 +1119,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_pp_semctl),
 	MEMBER_TO_FPTR(Perl_pp_require),
 	MEMBER_TO_FPTR(Perl_pp_require),	/* Perl_pp_dofile */
+	MEMBER_TO_FPTR(Perl_pp_hintseval),
 	MEMBER_TO_FPTR(Perl_pp_entereval),
 	MEMBER_TO_FPTR(Perl_pp_leaveeval),
 	MEMBER_TO_FPTR(Perl_pp_entertry),
@@ -1276,7 +1288,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* hex */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* oct */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* abs */
-	MEMBER_TO_FPTR(Perl_ck_lengthconst),	/* length */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* length */
 	MEMBER_TO_FPTR(Perl_ck_substr),	/* substr */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* vec */
 	MEMBER_TO_FPTR(Perl_ck_index),	/* index */
@@ -1295,14 +1307,18 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* aelemfast */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* aelem */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* aslice */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* each */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* values */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* keys */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* aeach */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* akeys */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* avalues */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* each */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* values */
+	MEMBER_TO_FPTR(Perl_ck_each),	/* keys */
 	MEMBER_TO_FPTR(Perl_ck_delete),	/* delete */
 	MEMBER_TO_FPTR(Perl_ck_exists),	/* exists */
 	MEMBER_TO_FPTR(Perl_ck_rvconst),	/* rv2hv */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* helem */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* hslice */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* boolkeys */
 	MEMBER_TO_FPTR(Perl_ck_unpack),	/* unpack */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* pack */
 	MEMBER_TO_FPTR(Perl_ck_split),	/* split */
@@ -1359,7 +1375,6 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* dump */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* goto */
 	MEMBER_TO_FPTR(Perl_ck_exit),	/* exit */
-	MEMBER_TO_FPTR(Perl_ck_null),	/* setstate */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* method_named */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* entergiven */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* leavegiven */
@@ -1391,8 +1406,6 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* sysseek */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* sysread */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* syswrite */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* send */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* recv */
 	MEMBER_TO_FPTR(Perl_ck_eof),	/* eof */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* tell */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* seek */
@@ -1400,6 +1413,8 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* fcntl */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* ioctl */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* flock */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* send */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* recv */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* socket */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* sockpair */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* bind */
@@ -1488,9 +1503,10 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* semctl */
 	MEMBER_TO_FPTR(Perl_ck_require),	/* require */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* dofile */
+	MEMBER_TO_FPTR(Perl_ck_svconst),	/* hintseval */
 	MEMBER_TO_FPTR(Perl_ck_eval),	/* entereval */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* leaveeval */
-	MEMBER_TO_FPTR(Perl_ck_null),	/* entertry */
+	MEMBER_TO_FPTR(Perl_ck_eval),	/* entertry */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* leavetry */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* ghbyname */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* ghbyaddr */
@@ -1669,6 +1685,9 @@ EXTCONST U32 PL_opargs[] = {
 	0x00026c04,	/* aelemfast */
 	0x00026404,	/* aelem */
 	0x00046801,	/* aslice */
+	0x00007600,	/* aeach */
+	0x00007608,	/* akeys */
+	0x00007608,	/* avalues */
 	0x00009600,	/* each */
 	0x00009608,	/* values */
 	0x00009608,	/* keys */
@@ -1677,6 +1696,7 @@ EXTCONST U32 PL_opargs[] = {
 	0x00000248,	/* rv2hv */
 	0x00028404,	/* helem */
 	0x00048801,	/* hslice */
+	0x00009600,	/* boolkeys */
 	0x00122800,	/* unpack */
 	0x0004280d,	/* pack */
 	0x00222808,	/* split */
@@ -1733,7 +1753,6 @@ EXTCONST U32 PL_opargs[] = {
 	0x00001a44,	/* dump */
 	0x00001a44,	/* goto */
 	0x00013644,	/* exit */
-	0x00001404,	/* setstate */
 	0x00000c40,	/* method_named */
 	0x00000640,	/* entergiven */
 	0x00000200,	/* leavegiven */
@@ -1765,8 +1784,6 @@ EXTCONST U32 PL_opargs[] = {
 	0x0022c804,	/* sysseek */
 	0x122ec81d,	/* sysread */
 	0x1322c81d,	/* syswrite */
-	0x1222c81d,	/* send */
-	0x022ec81d,	/* recv */
 	0x0001d614,	/* eof */
 	0x0001d60c,	/* tell */
 	0x0022c804,	/* seek */
@@ -1774,6 +1791,8 @@ EXTCONST U32 PL_opargs[] = {
 	0x0022c80c,	/* fcntl */
 	0x0022c80c,	/* ioctl */
 	0x0002c91c,	/* flock */
+	0x1222c81d,	/* send */
+	0x022ec81d,	/* recv */
 	0x0222c814,	/* socket */
 	0x222cc814,	/* sockpair */
 	0x0002c814,	/* bind */
@@ -1862,9 +1881,10 @@ EXTCONST U32 PL_opargs[] = {
 	0x0222281d,	/* semctl */
 	0x000136c0,	/* require */
 	0x00002240,	/* dofile */
+	0x00000c04,	/* hintseval */
 	0x00003640,	/* entereval */
 	0x00002200,	/* leaveeval */
-	0x00000600,	/* entertry */
+	0x00001640,	/* entertry */
 	0x00000800,	/* leavetry */
 	0x00003600,	/* ghbyname */
 	0x00022800,	/* ghbyaddr */