X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.c;h=4d73e4094626c2876743416db00f14c67efbd61e;hb=2035c5e8eb03b194190a7ef87630a0e4cc7c6251;hp=ebefe3787d3a63725cc2a68c5130c9b5a2526363;hpb=411caa507cab4ba311ec4000c486ad2592d51146;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/av.c b/av.c
index ebefe37..4d73e40 100644
--- a/av.c
+++ b/av.c
@@ -1,6 +1,6 @@
 /*    av.c
  *
- *    Copyright (c) 1991-2000, Larry Wall
+ *    Copyright (c) 1991-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -12,6 +12,10 @@
  * meant that things should remain where they had set them)." --Treebeard
  */
 
+/*
+=head1 Array Manipulation Functions
+*/
+
 #include "EXTERN.h"
 #define PERL_IN_AV_C
 #include "perl.h"
@@ -25,8 +29,8 @@ Perl_av_reify(pTHX_ AV *av)
     if (AvREAL(av))
 	return;
 #ifdef DEBUGGING
-    if (SvTIED_mg((SV*)av, 'P') && ckWARN_d(WARN_DEBUGGING))
-	Perl_warner(aTHX_ WARN_DEBUGGING, "av_reify called on tied array");
+    if (SvTIED_mg((SV*)av, PERL_MAGIC_tied) && ckWARN_d(WARN_DEBUGGING))
+	Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "av_reify called on tied array");
 #endif
     key = AvMAX(av) + 1;
     while (key > AvFILLp(av) + 1)
@@ -57,7 +61,7 @@ void
 Perl_av_extend(pTHX_ AV *av, I32 key)
 {
     MAGIC *mg;
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;
 	ENTER;
 	SAVETMPS;
@@ -96,7 +100,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
 	}
 	else {
 	    if (AvALLOC(av)) {
-#ifndef STRANGE_MALLOC
+#if !defined(STRANGE_MALLOC) && !defined(MYMALLOC)
 		MEM_SIZE bytes;
 		IV itmp;
 #endif
@@ -115,7 +119,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
 		bytes = (newmax + 1) * sizeof(SV*);
 #define MALLOC_OVERHEAD 16
 		itmp = MALLOC_OVERHEAD;
-		while (itmp - MALLOC_OVERHEAD < bytes)
+		while ((MEM_SIZE)(itmp - MALLOC_OVERHEAD) < bytes)
 		    itmp += itmp;
 		itmp -= MALLOC_OVERHEAD;
 		itmp /= sizeof(SV*);
@@ -130,7 +134,9 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
 		    Safefree(AvALLOC(av));
 		AvALLOC(av) = ary;
 #endif
+#if defined(MYMALLOC) && !defined(LEAKTEST)
 	      resized:
+#endif
 		ary = AvALLOC(av) + AvMAX(av) + 1;
 		tmp = newmax - AvMAX(av);
 		if (av == PL_curstack) {	/* Oops, grew stack (via av_store()?) */
@@ -185,7 +191,9 @@ Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval)
     }
 
     if (SvRMAGICAL(av)) {
-	if (mg_find((SV*)av,'P') || mg_find((SV*)av,'D')) {
+	if (mg_find((SV*)av, PERL_MAGIC_tied) ||
+		mg_find((SV*)av, PERL_MAGIC_regdata))
+	{
 	    sv = sv_newmortal();
 	    mg_copy((SV*)av, sv, 0, key);
 	    PL_av_fetch_sv = sv;
@@ -253,7 +261,7 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val)
 	Perl_croak(aTHX_ PL_no_modify);
 
     if (SvRMAGICAL(av)) {
-	if (mg_find((SV*)av,'P')) {
+	if (mg_find((SV*)av, PERL_MAGIC_tied)) {
 	    if (val != &PL_sv_undef) {
 		mg_copy((SV*)av, val, 0, key);
 	    }
@@ -387,7 +395,7 @@ Perl_av_clear(pTHX_ register AV *av)
 
 #ifdef DEBUGGING
     if (SvREFCNT(av) == 0 && ckWARN_d(WARN_DEBUGGING)) {
-	Perl_warner(aTHX_ WARN_DEBUGGING, "Attempt to clear deleted array");
+	Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "Attempt to clear deleted array");
     }
 #endif
     if (!av)
@@ -438,7 +446,7 @@ Perl_av_undef(pTHX_ register AV *av)
     /*SUPPRESS 560*/
 
     /* Give any tie a chance to cleanup first */
-    if (SvTIED_mg((SV*)av, 'P')) 
+    if (SvTIED_mg((SV*)av, PERL_MAGIC_tied)) 
 	av_fill(av, -1);   /* mg_clear() ? */
 
     if (AvREAL(av)) {
@@ -474,7 +482,7 @@ Perl_av_push(pTHX_ register AV *av, SV *val)
     if (SvREADONLY(av))
 	Perl_croak(aTHX_ PL_no_modify);
 
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;
 	PUSHSTACKi(PERLSI_MAGIC);
 	PUSHMARK(SP);
@@ -506,11 +514,11 @@ Perl_av_pop(pTHX_ register AV *av)
     SV *retval;
     MAGIC* mg;
 
-    if (!av || AvFILL(av) < 0)
-	return &PL_sv_undef;
+    if (!av)
+      return &PL_sv_undef;
     if (SvREADONLY(av))
 	Perl_croak(aTHX_ PL_no_modify);
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;    
 	PUSHSTACKi(PERLSI_MAGIC);
 	PUSHMARK(SP);
@@ -526,6 +534,8 @@ Perl_av_pop(pTHX_ register AV *av)
 	POPSTACK;
 	return retval;
     }
+    if (AvFILL(av) < 0)
+	return &PL_sv_undef;
     retval = AvARRAY(av)[AvFILLp(av)];
     AvARRAY(av)[AvFILLp(av)--] = &PL_sv_undef;
     if (SvSMAGICAL(av))
@@ -551,12 +561,12 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
     MAGIC* mg;
     I32 slide;
 
-    if (!av || num <= 0)
+    if (!av)
 	return;
     if (SvREADONLY(av))
 	Perl_croak(aTHX_ PL_no_modify);
 
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;
 	PUSHSTACKi(PERLSI_MAGIC);
 	PUSHMARK(SP);
@@ -573,6 +583,8 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
 	return;
     }
 
+    if (num <= 0)
+      return;
     if (!AvREAL(av) && AvREIFY(av))
 	av_reify(av);
     i = AvARRAY(av) - AvALLOC(av);
@@ -618,11 +630,11 @@ Perl_av_shift(pTHX_ register AV *av)
     SV *retval;
     MAGIC* mg;
 
-    if (!av || AvFILL(av) < 0)
+    if (!av)
 	return &PL_sv_undef;
     if (SvREADONLY(av))
 	Perl_croak(aTHX_ PL_no_modify);
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;
 	PUSHSTACKi(PERLSI_MAGIC);
 	PUSHMARK(SP);
@@ -638,6 +650,8 @@ Perl_av_shift(pTHX_ register AV *av)
 	POPSTACK;
 	return retval;
     }
+    if (AvFILL(av) < 0)
+      return &PL_sv_undef;
     retval = *AvARRAY(av);
     if (AvREAL(av))
 	*AvARRAY(av) = &PL_sv_undef;
@@ -680,7 +694,7 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill)
 	Perl_croak(aTHX_ "panic: null array");
     if (fill < 0)
 	fill = -1;
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;            
 	ENTER;
 	SAVETMPS;
@@ -743,13 +757,14 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
     }
     if (SvRMAGICAL(av)) {
 	SV **svp;
-	if ((mg_find((SV*)av,'P') || mg_find((SV*)av,'D'))
+	if ((mg_find((SV*)av, PERL_MAGIC_tied) ||
+		mg_find((SV*)av, PERL_MAGIC_regdata))
 	    && (svp = av_fetch(av, key, TRUE)))
 	{
 	    sv = *svp;
 	    mg_clear(sv);
-	    if (mg_find(sv, 'p')) {
-		sv_unmagic(sv, 'p');		/* No longer an element */
+	    if (mg_find(sv, PERL_MAGIC_tiedelem)) {
+		sv_unmagic(sv, PERL_MAGIC_tiedelem);	/* No longer an element */
 		return sv;
 	    }
 	    return Nullsv;			/* element cannot be deleted */
@@ -760,6 +775,7 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
     else {
 	sv = AvARRAY(av)[key];
 	if (key == AvFILLp(av)) {
+	    AvARRAY(av)[key] = &PL_sv_undef;
 	    do {
 		AvFILLp(av)--;
 	    } while (--key >= 0 && AvARRAY(av)[key] == &PL_sv_undef);
@@ -797,15 +813,17 @@ Perl_av_exists(pTHX_ AV *av, I32 key)
 	    return FALSE;
     }
     if (SvRMAGICAL(av)) {
-	if (mg_find((SV*)av,'P') || mg_find((SV*)av,'D')) {
+	if (mg_find((SV*)av, PERL_MAGIC_tied) ||
+		mg_find((SV*)av, PERL_MAGIC_regdata))
+	{
 	    SV *sv = sv_newmortal();
 	    MAGIC *mg;
 
 	    mg_copy((SV*)av, sv, 0, key);
-	    mg = mg_find(sv, 'p');
+	    mg = mg_find(sv, PERL_MAGIC_tiedelem);
 	    if (mg) {
 		magic_existspack(sv, mg);
-		return SvTRUE(sv);
+		return (bool)SvTRUE(sv);
 	    }
 	}
     }