develooper Front page | perl.perl5.porters | Postings from June 2001

[PATCH #4/7] xhv_keys

Thread Previous | Thread Next
From:
Abhijit Menon-Sen
Date:
June 16, 2001 20:06
Subject:
[PATCH #4/7] xhv_keys
Message ID:
20010617083617.D28776@lustre.linux.in
--- perl/hv.c4~	Sun Jun 17 08:21:11 2001
+++ perl/hv.c	Sun Jun 17 08:27:51 2001
@@ -486,10 +486,10 @@
     HeNEXT(entry) = *oentry;
     *oentry = entry;
 
-    xhv->xhv_keys++;
+    HvKEYS(hv)++;
     if (i) {				/* initial entry? */
 	HvFILL(hv)++;
-	if (xhv->xhv_keys > xhv->xhv_max)
+	if (HvKEYS(hv) > xhv->xhv_max)
 	    hsplit(hv);
     }
 
@@ -598,10 +598,10 @@
     HeNEXT(entry) = *oentry;
     *oentry = entry;
 
-    xhv->xhv_keys++;
+    HvKEYS(hv)++;
     if (i) {				/* initial entry? */
 	HvFILL(hv)++;
-	if (xhv->xhv_keys > xhv->xhv_max)
+	if (HvKEYS(hv) > xhv->xhv_max)
 	    hsplit(hv);
     }
 
@@ -702,7 +702,7 @@
 	    HvLAZYDEL_on(hv);
 	else
 	    hv_free_ent(hv, entry);
-	--xhv->xhv_keys;
+	HvKEYS(hv)--;
 	return sv;
     }
     if (key != keysave)
@@ -802,7 +802,7 @@
 	    HvLAZYDEL_on(hv);
 	else
 	    hv_free_ent(hv, entry);
-	--xhv->xhv_keys;
+	HvKEYS(hv)--;
 	return sv;
     }
     if (key != keysave)
@@ -1258,7 +1258,7 @@
     xhv = (XPVHV*)SvANY(hv);
     hfreeentries(hv);
     HvFILL(hv) = 0;
-    xhv->xhv_keys = 0;
+    HvKEYS(hv) = 0;
     if (HvARRAY(hv))
 	(void)memzero(HvARRAY(hv), (xhv->xhv_max + 1) * sizeof(HE*));
 
@@ -1323,7 +1323,7 @@
     HvARRAY(hv) = 0;
     xhv->xhv_max = 7;		/* it's a normal hash */
     HvFILL(hv) = 0;
-    xhv->xhv_keys = 0;
+    HvKEYS(hv) = 0;
 
     if (SvRMAGICAL(hv))
 	mg_clear((SV*)hv);
@@ -1359,7 +1359,7 @@
     }
     xhv->xhv_riter = -1;
     HvEITER(hv) = Null(HE*);
-    return xhv->xhv_keys;	/* used to be xhv->xhv_fill before 5.004_65 */
+    return HvKEYS(hv);		/* used to be xhv->xhv_fill before 5.004_65 */
 }
 
 /*
@@ -1600,7 +1600,7 @@
 		HvFILL(hv)--;
 	    Safefree(HeKEY_hek(entry));
 	    del_HE(entry);
-	    --xhv->xhv_keys;
+	    HvKEYS(hv)--;
 	}
 	break;
     }
@@ -1665,10 +1665,10 @@
 	HeVAL(entry) = Nullsv;
 	HeNEXT(entry) = *oentry;
 	*oentry = entry;
-	xhv->xhv_keys++;
+	HvKEYS(hv)++;
 	if (i) {				/* initial entry? */
 	    HvFILL(hv)++;
-	    if (xhv->xhv_keys > xhv->xhv_max)
+	    if (HvKEYS(hv) > xhv->xhv_max)
 		hsplit(hv);
 	}
     }

Thread Previous | Thread Next


nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About