X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.c;h=8a4f8556450239fe43fa3d95b777c45390cd5827;hb=e0fa5af24242618e2201252ebce12dfc87892dd1;hp=819887e2ad59c17e9cc98f3701e558f8aa3117b1;hpb=155aba94f677ac771761a1f510964fe5b21524ed;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/av.c b/av.c
index 819887e..8a4f855 100644
--- a/av.c
+++ b/av.c
@@ -1,6 +1,6 @@
 /*    av.c
  *
- *    Copyright (c) 1991-2000, Larry Wall
+ *    Copyright (c) 1991-2001, 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.
@@ -25,7 +25,7 @@ Perl_av_reify(pTHX_ AV *av)
     if (AvREAL(av))
 	return;
 #ifdef DEBUGGING
-    if (SvTIED_mg((SV*)av, 'P') && ckWARN_d(WARN_DEBUGGING))
+    if (SvTIED_mg((SV*)av, PERL_MAGIC_tied) && ckWARN_d(WARN_DEBUGGING))
 	Perl_warner(aTHX_ WARN_DEBUGGING, "av_reify called on tied array");
 #endif
     key = AvMAX(av) + 1;
@@ -34,10 +34,8 @@ Perl_av_reify(pTHX_ AV *av)
     while (key) {
 	sv = AvARRAY(av)[--key];
 	assert(sv);
-	if (sv != &PL_sv_undef) {
-	    dTHR;
+	if (sv != &PL_sv_undef)
 	    (void)SvREFCNT_inc(sv);
-	}
     }
     key = AvARRAY(av) - AvALLOC(av);
     while (key)
@@ -58,9 +56,8 @@ extended.
 void
 Perl_av_extend(pTHX_ AV *av, I32 key)
 {
-    dTHR;			/* only necessary if we have to extend stack */
     MAGIC *mg;
-    if ((mg = SvTIED_mg((SV*)av, 'P'))) {
+    if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) {
 	dSP;
 	ENTER;
 	SAVETMPS;
@@ -99,7 +96,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
@@ -133,7 +130,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()?) */
@@ -188,8 +187,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')) {
-	    dTHR;
+	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;
@@ -257,7 +257,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);
 	    }
@@ -272,7 +272,6 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val)
     ary = AvARRAY(av);
     if (AvFILLp(av) < key) {
 	if (!AvREAL(av)) {
-	    dTHR;
 	    if (av == PL_curstack && key > PL_stack_sp - PL_stack_base)
 		PL_stack_sp = PL_stack_base + key;	/* XPUSH in disguise */
 	    do
@@ -443,7 +442,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)) {
@@ -479,7 +478,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);
@@ -515,7 +514,7 @@ Perl_av_pop(pTHX_ register AV *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);
@@ -554,13 +553,14 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
     register I32 i;
     register SV **ary;
     MAGIC* mg;
+    I32 slide;
 
     if (!av || num <= 0)
 	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);
@@ -591,6 +591,9 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
     }
     if (num) {
 	i = AvFILLp(av);
+	/* Create extra elements */
+	slide = i > 0 ? i : 0;
+	num += slide;
 	av_extend(av, i + num);
 	AvFILLp(av) += num;
 	ary = AvARRAY(av);
@@ -598,6 +601,10 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
 	do {
 	    ary[--num] = &PL_sv_undef;
 	} while (num);
+	/* Make extra elements into a buffer */
+	AvMAX(av) -= slide;
+	AvFILLp(av) -= slide;
+	SvPVX(av) = (char*)(AvARRAY(av) + slide);
     }
 }
 
@@ -619,7 +626,7 @@ Perl_av_shift(pTHX_ register AV *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);
@@ -661,6 +668,14 @@ Perl_av_len(pTHX_ register AV *av)
     return AvFILL(av);
 }
 
+/*
+=for apidoc av_fill
+
+Ensure than an array has a given number of elements, equivalent to
+Perl's C<$#array = $fill;>.
+
+=cut
+*/
 void
 Perl_av_fill(pTHX_ register AV *av, I32 fill)
 {
@@ -669,7 +684,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;
@@ -708,6 +723,14 @@ Perl_av_fill(pTHX_ register AV *av, I32 fill)
 	(void)av_store(av,fill,&PL_sv_undef);
 }
 
+/*
+=for apidoc av_delete
+
+Deletes the element indexed by C<key> from the array.  Returns the
+deleted element. C<flags> is currently ignored.
+
+=cut
+*/
 SV *
 Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
 {
@@ -724,13 +747,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 */
@@ -741,6 +765,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);
@@ -758,10 +783,15 @@ Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags)
 }
 
 /*
- * This relies on the fact that uninitialized array elements
- * are set to &PL_sv_undef.
- */
+=for apidoc av_exists
+
+Returns true if the element indexed by C<key> has been initialized.
+
+This relies on the fact that uninitialized array elements are set to
+C<&PL_sv_undef>.
 
+=cut
+*/
 bool
 Perl_av_exists(pTHX_ AV *av, I32 key)
 {
@@ -773,11 +803,18 @@ 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);
-	    magic_existspack(sv, mg_find(sv, 'p'));
-	    return SvTRUE(sv);
+	    mg = mg_find(sv, PERL_MAGIC_tiedelem);
+	    if (mg) {
+		magic_existspack(sv, mg);
+		return SvTRUE(sv);
+	    }
 	}
     }
     if (key <= AvFILLp(av) && AvARRAY(av)[key] != &PL_sv_undef