summaryrefslogtreecommitdiff
path: root/doop.c
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2002-08-06 06:05:10 -0700
committerhv <hv@crypt.org>2002-08-17 00:51:19 +0000
commit6d822dc4045278fb03135b2683bac92dba061369 (patch)
tree39e9aa0ce54a7caf711f12d43985793b79fb762d /doop.c
parent485894a1e3cb3873ba7373c744a8b6231190fbf8 (diff)
downloadperl-6d822dc4045278fb03135b2683bac92dba061369.tar.gz
Remove pseudo-hashes (complete)
Message-id: <20020806200510.GC31473@ool-18b93024.dyn.optonline.net> p4raw-id: //depot/perl@17725
Diffstat (limited to 'doop.c')
-rw-r--r--doop.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/doop.c b/doop.c
index f4f012f78c..7aee091d32 100644
--- a/doop.c
+++ b/doop.c
@@ -1280,7 +1280,6 @@ Perl_do_kv(pTHX)
I32 gimme = GIMME_V;
I32 dokeys = (PL_op->op_type == OP_KEYS);
I32 dovalues = (PL_op->op_type == OP_VALUES);
- I32 realhv = (SvTYPE(hv) == SVt_PVHV);
if (PL_op->op_type == OP_RV2HV || PL_op->op_type == OP_PADHV)
dokeys = dovalues = TRUE;
@@ -1295,7 +1294,7 @@ Perl_do_kv(pTHX)
RETURN;
}
- keys = realhv ? hv : avhv_keys((AV*)hv);
+ keys = hv;
(void)hv_iterinit(keys); /* always reset iterator regardless */
if (gimme == G_VOID)
@@ -1342,8 +1341,7 @@ Perl_do_kv(pTHX)
}
if (dovalues) {
PUTBACK;
- tmpstr = realhv ?
- hv_iterval(hv,entry) : avhv_iterval((AV*)hv,entry);
+ tmpstr = hv_iterval(hv,entry);
DEBUG_H(Perl_sv_setpvf(aTHX_ tmpstr, "%lu%%%d=%lu",
(unsigned long)HeHASH(entry),
HvMAX(keys)+1,