diff options
| author | Yitzchak Scott-Thoennes <sthoenna@efn.org> | 2003-09-29 23:01:50 -0700 |
|---|---|---|
| committer | Abhijit Menon-Sen <ams@wiw.org> | 2003-10-01 20:28:20 +0000 |
| commit | be85d34438445e22b1284a6bdfb03db1aac59f18 (patch) | |
| tree | 795c2d4711e4a6987f76ffcf42b81bb298b999b1 /pp_hot.c | |
| parent | 325192b1501ec5e5c61fcc775e645f404027aa64 (diff) | |
| download | perl-be85d34438445e22b1284a6bdfb03db1aac59f18.tar.gz | |
misapplied patch 19452
Message-Id: <20030930130150.GA1436@efn.org>
p4raw-id: //depot/perl@21394
Diffstat (limited to 'pp_hot.c')
| -rw-r--r-- | pp_hot.c | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -795,6 +795,7 @@ PP(pp_rv2hv) { dSP; dTOPss; HV *hv; + I32 gimme = GIMME_V; if (SvROK(sv)) { wasref: @@ -808,7 +809,7 @@ PP(pp_rv2hv) RETURN; } else if (LVRET) { - if (GIMME != G_SCALAR) + if (gimme != G_ARRAY) Perl_croak(aTHX_ "Can't return hash to lvalue scalar context"); SETs((SV*)hv); RETURN; @@ -825,7 +826,7 @@ PP(pp_rv2hv) RETURN; } else if (LVRET) { - if (GIMME == G_SCALAR) + if (gimme != G_ARRAY) Perl_croak(aTHX_ "Can't return hash to lvalue" " scalar context"); SETs((SV*)hv); @@ -850,7 +851,7 @@ PP(pp_rv2hv) DIE(aTHX_ PL_no_usym, "a HASH"); if (ckWARN(WARN_UNINITIALIZED)) report_uninit(); - if (GIMME == G_ARRAY) { + if (gimme == G_ARRAY) { SP--; RETURN; } @@ -885,7 +886,7 @@ PP(pp_rv2hv) RETURN; } else if (LVRET) { - if (GIMME == G_SCALAR) + if (gimme != G_ARRAY) Perl_croak(aTHX_ "Can't return hash to lvalue" " scalar context"); SETs((SV*)hv); @@ -894,12 +895,15 @@ PP(pp_rv2hv) } } - if (GIMME == G_ARRAY) { /* array wanted */ + if (gimme == G_ARRAY) { /* array wanted */ *PL_stack_sp = (SV*)hv; return do_kv(); } - else { + else if (gimme == G_SCALAR) { dTARGET; + if (SvRMAGICAL(hv) && mg_find((SV *)hv, PERL_MAGIC_tied)) + Perl_croak(aTHX_ "Can't provide tied hash usage; " + "use keys(%%hash) to test if empty"); if (HvFILL(hv)) Perl_sv_setpvf(aTHX_ TARG, "%"IVdf"/%"IVdf, (IV)HvFILL(hv), (IV)HvMAX(hv) + 1); @@ -907,8 +911,8 @@ PP(pp_rv2hv) sv_setiv(TARG, 0); SETTARG; - RETURN; } + RETURN; } STATIC void |