Change 33895 by [EMAIL PROTECTED] on 2008/05/21 07:11:50
Integrate:
[ 33849]
Subject: [perl #38955] exists(): error message on wrong argument type
is incorrect (5.8.7 cygwin)
From: "Bram via RT" <[EMAIL PROTECTED]>
Date: Sat, 17 May 2008 04:14:11 -0700
Message-ID: <[EMAIL PROTECTED]>
[ 33891]
metabatman fails the "this patch is self-documenting" test. Restore
(roughly) the original parameter names.
Affected files ...
... //depot/maint-5.10/perl/hv.h#4 integrate
... //depot/maint-5.10/perl/op.c#9 integrate
... //depot/maint-5.10/perl/pod/perldiag.pod#3 integrate
Differences ...
==== //depot/maint-5.10/perl/hv.h#4 (text) ====
Index: perl/hv.h
--- perl/hv.h#3~33610~ 2008-03-30 16:20:46.000000000 -0700
+++ perl/hv.h 2008-05-21 00:11:50.000000000 -0700
@@ -425,42 +425,42 @@
->shared_he_he.he_valu.hent_refcount), \
hek)
-#define hv_store_ent(zlonk, awk, touche, zgruppp) \
- ((HE *) hv_common((zlonk), (awk), NULL, 0, 0, HV_FETCH_ISSTORE, \
- (touche), (zgruppp)))
+#define hv_store_ent(hv, keysv, val, hash) \
+ ((HE *) hv_common((hv), (keysv), NULL, 0, 0, HV_FETCH_ISSTORE, \
+ (val), (hash)))
-#define hv_exists_ent(zlonk, awk, zgruppp) \
- (hv_common((zlonk), (awk), NULL, 0, 0, HV_FETCH_ISEXISTS, 0, (zgruppp))\
+#define hv_exists_ent(hv, keysv, hash) \
+ (hv_common((hv), (keysv), NULL, 0, 0, HV_FETCH_ISEXISTS, 0, (hash))
\
? TRUE : FALSE)
-#define hv_fetch_ent(zlonk, awk, touche, zgruppp) \
- ((HE *) hv_common((zlonk), (awk), NULL, 0, 0, \
- ((touche) ? HV_FETCH_LVALUE : 0), NULL, (zgruppp)))
-#define hv_delete_ent(zlonk, awk, touche, zgruppp) \
- ((SV *) hv_common((zlonk), (awk), NULL, 0, 0, (touche) | HV_DELETE,
\
- NULL, (zgruppp)))
-
-#define hv_store_flags(urkk, zamm, clunk, thwape, sploosh, eee_yow) \
- ((SV**) hv_common((urkk), NULL, (zamm), (clunk), (eee_yow),
\
- (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), (thwape), \
- (sploosh)))
+#define hv_fetch_ent(hv, keysv, lval, hash) \
+ ((HE *) hv_common((hv), (keysv), NULL, 0, 0, \
+ ((lval) ? HV_FETCH_LVALUE : 0), NULL, (hash)))
+#define hv_delete_ent(hv, key, flags, hash) \
+ ((SV *) hv_common((hv), (key), NULL, 0, 0, (flags) | HV_DELETE, \
+ NULL, (hash)))
+
+#define hv_store_flags(hv, key, klen, val, hash, flags)
\
+ ((SV**) hv_common((hv), NULL, (key), (klen), (flags), \
+ (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), (val), \
+ (hash)))
-#define hv_store(urkk, zamm, clunk, thwape, sploosh) \
- ((SV**) hv_common_key_len((urkk), (zamm), (clunk), \
+#define hv_store(hv, key, klen, val, hash) \
+ ((SV**) hv_common_key_len((hv), (key), (klen), \
(HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), \
- (thwape), (sploosh)))
+ (val), (hash)))
-#define hv_exists(urkk, zamm, clunk) \
- (hv_common_key_len((urkk), (zamm), (clunk), HV_FETCH_ISEXISTS, NULL, 0) \
+#define hv_exists(hv, key, klen) \
+ (hv_common_key_len((hv), (key), (klen), HV_FETCH_ISEXISTS, NULL, 0) \
? TRUE : FALSE)
-#define hv_fetch(urkk, zamm, clunk, pam) \
- ((SV**) hv_common_key_len((urkk), (zamm), (clunk), (pam) \
+#define hv_fetch(hv, key, klen, lval) \
+ ((SV**) hv_common_key_len((hv), (key), (klen), (lval) \
? (HV_FETCH_JUST_SV | HV_FETCH_LVALUE) \
: HV_FETCH_JUST_SV, NULL, 0))
-#define hv_delete(urkk, zamm, clunk, pam) \
- ((SV*) hv_common_key_len((urkk), (zamm), (clunk), \
- (pam) | HV_DELETE, NULL, 0))
+#define hv_delete(hv, key, klen, flags)
\
+ ((SV*) hv_common_key_len((hv), (key), (klen), \
+ (flags) | HV_DELETE, NULL, 0))
/* This refcounted he structure is used for storing the hints used for lexical
pragmas. Without threads, it's basically struct he + refcount.
==== //depot/maint-5.10/perl/op.c#9 (text) ====
Index: perl/op.c
--- perl/op.c#8~33743~ 2008-04-24 19:39:50.000000000 -0700
+++ perl/op.c 2008-05-21 00:11:50.000000000 -0700
@@ -6339,7 +6339,7 @@
else if (kid->op_type == OP_AELEM)
o->op_flags |= OPf_SPECIAL;
else if (kid->op_type != OP_HELEM)
- Perl_croak(aTHX_ "%s argument is not a HASH or ARRAY element",
+ Perl_croak(aTHX_ "%s argument is not a HASH or ARRAY element or a
subroutine",
OP_DESC(o));
op_null(kid);
}
==== //depot/maint-5.10/perl/pod/perldiag.pod#3 (text) ====
Index: perl/pod/perldiag.pod
--- perl/pod/perldiag.pod#2~33745~ 2008-04-24 20:30:37.000000000 -0700
+++ perl/pod/perldiag.pod 2008-05-21 00:11:50.000000000 -0700
@@ -131,7 +131,7 @@
(F) msgsnd() requires a string at least as long as sizeof(long).
-=item %s argument is not a HASH or ARRAY element
+=item %s argument is not a HASH or ARRAY element or a subroutine
(F) The argument to exists() must be a hash or array element or a
subroutine with an ampersand, such as:
End of Patch.
