diff options
| author | Rick Delaney <rick@consumercontact.com> | 2004-10-13 08:40:18 -0400 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-01-21 13:35:49 +0000 |
| commit | 10ac92784f49d4a1fe54cc1ed7d05f0d3b2a2f29 (patch) | |
| tree | 4cca0a2e6335a7643ffd197e409d74d5827ab231 /hv.c | |
| parent | 049f818b9a6d0ed6efed5c49515a9d137e475267 (diff) | |
| download | perl-10ac92784f49d4a1fe54cc1ed7d05f0d3b2a2f29.tar.gz | |
Re: [perl #31924] %INC caching failure-case problem
Message-ID: <20041013164018.GA32174@biff.bort.ca>
p4raw-id: //depot/perl@23843
Diffstat (limited to 'hv.c')
| -rw-r--r-- | hv.c | 45 |
1 files changed, 44 insertions, 1 deletions
@@ -186,6 +186,7 @@ S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, #define HV_FETCH_ISEXISTS 0x02 #define HV_FETCH_LVALUE 0x04 #define HV_FETCH_JUST_SV 0x08 +#define HV_FETCH_PLACEHOLDER 0x10 /* =for apidoc hv_store @@ -337,6 +338,46 @@ Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 lval) } /* +=for apidoc hv_fetch_flags + +Returns the SV which corresponds to the specified key in the hash. +See C<hv_fetch>. +The C<flags> value will normally be zero; if HV_FETCH_WANTPLACEHOLDERS is +set then placeholders keys (for restricted hashes) will be returned in addition +to normal keys. By default placeholders are automatically skipped over. +Currently a placeholder is implemented with a value that is +C<&Perl_sv_placeholder>. Note that the implementation of placeholders and +restricted hashes may change. + +=cut +*/ + +SV** +Perl_hv_fetch_flags(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 lval, + I32 flags) +{ + HE *hek; + STRLEN klen; + int common_flags; + + if (klen_i32 < 0) { + klen = -klen_i32; + common_flags = HVhek_UTF8; + } else { + klen = klen_i32; + common_flags = 0; + } + hek = hv_fetch_common (hv, NULL, key, klen, common_flags, + ((flags & HV_FETCH_WANTPLACEHOLDERS) + ? HV_FETCH_PLACEHOLDER + : 0) + | HV_FETCH_JUST_SV + | (lval ? HV_FETCH_LVALUE : 0), + Nullsv, 0); + return hek ? &HeVAL(hek) : NULL; +} + +/* =for apidoc hv_exists_ent Returns a boolean indicating whether the specified hash key exists. C<hash> @@ -693,7 +734,9 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, SvREFCNT_dec(HeVAL(entry)); HeVAL(entry) = val; } - } else if (HeVAL(entry) == &PL_sv_placeholder) { + } else if (HeVAL(entry) == &PL_sv_placeholder + && !(action & HV_FETCH_PLACEHOLDER)) + { /* if we find a placeholder, we pretend we haven't found anything */ break; |