Re: [PATCH] Change implementation of %+ to use a proper tied hash interface and add support for %-

Message-ID: <9b18b3110612291245q792fe91cu69422d2b81bb4f0b@mail.gmail.com>

p4raw-id: //depot/perl@29682

1 files changed, 5 insertions, 100 deletions

diff --git a/hv.c b/hv.c
index aa60e53d28..3852754ef0 100644
--- a/hv.c
+++ b/hv.c
@@ -450,10 +450,7 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
     xhv = (XPVHV*)SvANY(hv);
     if (SvMAGICAL(hv)) {
 	if (SvRMAGICAL(hv) && !(action & (HV_FETCH_ISSTORE|HV_FETCH_ISEXISTS))) {
-	    MAGIC *regdata = NULL;
-	    if (( regdata = mg_find((SV*)hv, PERL_MAGIC_regdata_names)) ||
-	        mg_find((SV*)hv, PERL_MAGIC_tied) ||
-	        SvGMAGICAL((SV*)hv))
+	    if ( mg_find((SV*)hv, PERL_MAGIC_tied) || SvGMAGICAL((SV*)hv))
 	    {
 		/* XXX should be able to skimp on the HE/HEK here when
 		   HV_FETCH_JUST_SV is true.  */
@@ -465,14 +462,8 @@ S_hv_fetch_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 		} else {
 		    keysv = newSVsv(keysv);
 		}
-		if (regdata) {
-		    sv = Perl_reg_named_buff_sv(aTHX_ keysv);
-		    if (!sv)
-			sv = sv_newmortal();
-		} else {
-		    sv = sv_newmortal();
-		    mg_copy((SV*)hv, sv, (char *)keysv, HEf_SVKEY);
-		}
+                sv = sv_newmortal();
+                mg_copy((SV*)hv, sv, (char *)keysv, HEf_SVKEY);
 
 		/* grab a fake HE/HEK pair from the pool or make a new one */
 		entry = PL_hv_fetch_ent_mh;
@@ -1931,17 +1922,7 @@ Perl_hv_iterinit(pTHX_ HV *hv)
     } else {
 	hv_auxinit(hv);
     }
-    if ( SvRMAGICAL(hv) ) {
-        MAGIC *mg = mg_find((SV*)hv, PERL_MAGIC_regdata_names);
-        if ( mg ) {
-             if (PL_curpm) {
-                const REGEXP * const rx = PM_GETRE(PL_curpm);
-                if (rx && rx->paren_names) {
-                    (void)hv_iterinit(rx->paren_names);
-                } 
-            } 
-        }
-    }
+
     /* used to be xhv->xhv_fill before 5.004_65 */
     return HvTOTALKEYS(hv);
 }
@@ -2109,83 +2090,7 @@ Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags)
 
     oldentry = entry = iter->xhv_eiter; /* HvEITER(hv) */
     if (SvMAGICAL(hv) && SvRMAGICAL(hv)) {
-	if ( ( mg = mg_find((SV*)hv, PERL_MAGIC_regdata_names) ) ) {
-            SV * key;
-            SV *val = NULL;
-            REGEXP * rx;
-            if (!PL_curpm)
-                return NULL;
-            rx = PM_GETRE(PL_curpm);
-            if (rx && rx->paren_names) {
-                hv = rx->paren_names;
-            } else {
-                return NULL;
-            }
-
-            key = sv_newmortal();
-            if (entry) {
-                sv_setsv(key, HeSVKEY_force(entry));
-                SvREFCNT_dec(HeSVKEY(entry));       /* get rid of previous key */
-            }
-            else {
-                char *k;
-                HEK *hek;
-
-                /* one HE per MAGICAL hash */
-                iter->xhv_eiter = entry = new_HE(); /* HvEITER(hv) = new_HE() */
-                Zero(entry, 1, HE);
-                Newxz(k, HEK_BASESIZE + sizeof(SV*), char);
-                hek = (HEK*)k;
-                HeKEY_hek(entry) = hek;
-                HeKLEN(entry) = HEf_SVKEY;
-            }
-            {
-                while (!val) {
-                    HE *temphe = hv_iternext_flags(hv,flags);
-                    if (temphe) {
-                        IV i;
-                        IV parno = 0;
-                        SV* sv_dat = HeVAL(temphe);
-                        I32 *nums = (I32*)SvPVX(sv_dat);
-                        for ( i = 0; i < SvIVX(sv_dat); i++ ) {
-                            if ((I32)(rx->lastcloseparen) >= nums[i] &&
-                                rx->startp[nums[i]] != -1 &&
-                                rx->endp[nums[i]] != -1)
-                            {
-                                parno = nums[i];
-                                break;
-                            }
-                        }
-                        if (parno) {
-                            GV *gv_paren;
-                            STRLEN len;
-                            SV *sv = sv_newmortal();
-                            const char* pvkey = HePV(temphe, len);
-
-                            Perl_sv_setpvf(aTHX_ sv, "%"IVdf,(IV)parno);
-                            gv_paren = Perl_gv_fetchsv(aTHX_ sv, GV_ADD, SVt_PVGV);
-                            Perl_sv_setpvn(aTHX_ key, pvkey, len);
-                            val = GvSVn(gv_paren);
-                        }
-                    } else {
-                        break;
-                    }
-                }
-            }
-            if (val && SvOK(key)) {
-                /* force key to stay around until next time */
-                HeSVKEY_set(entry, SvREFCNT_inc_simple_NN(key));
-                HeVAL(entry) = SvREFCNT_inc_simple_NN(val);
-                return entry;               /* beware, hent_val is not set */
-            }
-            if (HeVAL(entry))
-                SvREFCNT_dec(HeVAL(entry));
-            Safefree(HeKEY_hek(entry));
-            del_HE(entry);
-            iter->xhv_eiter = NULL; /* HvEITER(hv) = NULL */
-            return NULL;
-        }
-	else if ( ( mg = mg_find((SV*)hv, PERL_MAGIC_tied) ) ) {
+	if ( ( mg = mg_find((SV*)hv, PERL_MAGIC_tied) ) ) {
             SV * const key = sv_newmortal();
             if (entry) {
                 sv_setsv(key, HeSVKEY_force(entry));