X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=b155eeee948d54b27b14482b980f67896bb1ce7e;hb=b73edd974ff6de4630341da3b93d562a24ff05d7;hp=0e7ca25bfe896ec8fa29cf71515630398ac22861;hpb=463ee0b2acbd047c27e8b5393cdd8398881824c5;p=p5sagit%2Fp5-mst-13.2.git diff --git a/sv.c b/sv.c index 0e7ca25..b155eee 100644 --- a/sv.c +++ b/sv.c @@ -1,107 +1,390 @@ -/* $RCSfile: sv.c,v $$Revision: 4.1 $$Date: 92/08/07 18:26:45 $ +/* sv.c * - * Copyright (c) 1991, Larry Wall + * Copyright (c) 1991-1994, 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. * - * $Log: sv.c,v $ - * Revision 4.1 92/08/07 18:26:45 lwall - * - * Revision 4.0.1.6 92/06/11 21:14:21 lwall - * patch34: quotes containing subscripts containing variables didn't parse right - * - * Revision 4.0.1.5 92/06/08 15:40:43 lwall - * patch20: removed implicit int declarations on functions - * patch20: Perl now distinguishes overlapped copies from non-overlapped - * patch20: paragraph mode now skips extra newlines automatically - * patch20: fixed memory leak in doube-quote interpretation - * patch20: made /\$$foo/ look for literal '$foo' - * patch20: "$var{$foo'bar}" didn't scan subscript correctly - * patch20: a splice on non-existent array elements could dump core - * patch20: running taintperl explicitly now does checks even if $< == $> - * - * Revision 4.0.1.4 91/11/05 18:40:51 lwall - * patch11: $foo .= could overrun malloced memory - * patch11: \$ didn't always make it through double-quoter to regexp routines - * patch11: prepared for ctype implementations that don't define isascii() - * - * Revision 4.0.1.3 91/06/10 01:27:54 lwall - * patch10: $) and $| incorrectly handled in run-time patterns - * - * Revision 4.0.1.2 91/06/07 11:58:13 lwall - * patch4: new copyright notice - * patch4: taint check on undefined string could cause core dump - * - * Revision 4.0.1.1 91/04/12 09:15:30 lwall - * patch1: fixed undefined environ problem - * patch1: substr($ENV{"PATH"},0,0) = "/foo:" didn't modify environment - * patch1: $foo .= could cause core dump for certain lengths of $foo - * - * Revision 4.0 91/03/20 01:39:55 lwall - * 4.0 baseline. - * + */ + +/* + * "I wonder what the Entish is for 'yes' and 'no'," he thought. */ #include "EXTERN.h" #include "perl.h" -#include "perly.h" -static void ucase(); -static void lcase(); +#ifdef OVR_DBL_DIG +/* Use an overridden DBL_DIG */ +# ifdef DBL_DIG +# undef DBL_DIG +# endif +# define DBL_DIG OVR_DBL_DIG +#else +/* The following is all to get DBL_DIG, in order to pick a nice + default value for printing floating point numbers in Gconvert. + (see config.h) +*/ +#ifdef I_LIMITS +#include +#endif +#ifdef I_FLOAT +#include +#endif +#ifndef HAS_DBL_DIG +#define DBL_DIG 15 /* A guess that works lots of places */ +#endif +#endif + +#if defined(USE_STDIO_PTR) && defined(STDIO_PTR_LVALUE) && defined(STDIO_CNT_LVALUE) && !defined(__QNX__) +# define FAST_SV_GETS +#endif + +static SV *more_sv _((void)); +static XPVIV *more_xiv _((void)); +static XPVNV *more_xnv _((void)); +static XPV *more_xpv _((void)); +static XRV *more_xrv _((void)); +static XPVIV *new_xiv _((void)); +static XPVNV *new_xnv _((void)); +static XPV *new_xpv _((void)); +static XRV *new_xrv _((void)); +static void del_xiv _((XPVIV* p)); +static void del_xnv _((XPVNV* p)); +static void del_xpv _((XPV* p)); +static void del_xrv _((XRV* p)); +static void sv_mortalgrow _((void)); +static void sv_unglob _((SV* sv)); + +typedef void (*SVFUNC) _((SV*)); -static SV* sv_root; +#ifdef PURIFY -static SV* more_sv(); +#define new_SV(p) \ + do { \ + (p) = (SV*)safemalloc(sizeof(SV)); \ + reg_add(p); \ + } while (0) + +#define del_SV(p) \ + do { \ + reg_remove(p); \ + free((char*)(p)); \ + } while (0) + +static SV **registry; +static I32 regsize; + +#define REGHASH(sv,size) ((((U32)(sv)) >> 2) % (size)) + +#define REG_REPLACE(sv,a,b) \ + do { \ + void* p = sv->sv_any; \ + I32 h = REGHASH(sv, regsize); \ + I32 i = h; \ + while (registry[i] != (a)) { \ + if (++i >= regsize) \ + i = 0; \ + if (i == h) \ + die("SV registry bug"); \ + } \ + registry[i] = (b); \ + } while (0) + +#define REG_ADD(sv) REG_REPLACE(sv,Nullsv,sv) +#define REG_REMOVE(sv) REG_REPLACE(sv,sv,Nullsv) -static SV* -new_sv() +static void +reg_add(sv) +SV* sv; { - SV* sv; - if (sv_root) { - sv = sv_root; - sv_root = (SV*)SvANY(sv); - return sv; + if (sv_count >= (regsize >> 1)) + { + SV **oldreg = registry; + I32 oldsize = regsize; + + regsize = regsize ? ((regsize << 2) + 1) : 2037; + registry = (SV**)safemalloc(regsize * sizeof(SV*)); + memzero(registry, regsize * sizeof(SV*)); + + if (oldreg) { + I32 i; + + for (i = 0; i < oldsize; ++i) { + SV* oldsv = oldreg[i]; + if (oldsv) + REG_ADD(oldsv); + } + Safefree(oldreg); + } + } + + REG_ADD(sv); + ++sv_count; +} + +static void +reg_remove(sv) +SV* sv; +{ + REG_REMOVE(sv); + --sv_count; +} + +static void +visit(f) +SVFUNC f; +{ + I32 i; + + for (i = 0; i < regsize; ++i) { + SV* sv = registry[i]; + if (sv) + (*f)(sv); } - return more_sv(); } +void +sv_add_arena(ptr, size, flags) +char* ptr; +U32 size; +U32 flags; +{ + if (!(flags & SVf_FAKE)) + free(ptr); +} + +#else /* ! PURIFY */ + +/* + * "A time to plant, and a time to uproot what was planted..." + */ + +#define plant_SV(p) \ + do { \ + SvANY(p) = (void *)sv_root; \ + SvFLAGS(p) = SVTYPEMASK; \ + sv_root = (p); \ + --sv_count; \ + } while (0) + +#define uproot_SV(p) \ + do { \ + (p) = sv_root; \ + sv_root = (SV*)SvANY(p); \ + ++sv_count; \ + } while (0) + +#define new_SV(p) \ + if (sv_root) \ + uproot_SV(p); \ + else \ + (p) = more_sv() + +#ifdef DEBUGGING + +#define del_SV(p) \ + if (debug & 32768) \ + del_sv(p); \ + else \ + plant_SV(p) + static void del_sv(p) SV* p; { - SvANY(p) = sv_root; - sv_root = p; + if (debug & 32768) { + SV* sva; + SV* sv; + SV* svend; + int ok = 0; + for (sva = sv_arenaroot; sva; sva = (SV *) SvANY(sva)) { + sv = sva + 1; + svend = &sva[SvREFCNT(sva)]; + if (p >= sv && p < svend) + ok = 1; + } + if (!ok) { + warn("Attempt to free non-arena SV: 0x%lx", (unsigned long)p); + return; + } + } + plant_SV(p); } -static SV* -more_sv() +#else /* ! DEBUGGING */ + +#define del_SV(p) plant_SV(p) + +#endif /* DEBUGGING */ + +void +sv_add_arena(ptr, size, flags) +char* ptr; +U32 size; +U32 flags; { - register int i; + SV* sva = (SV*)ptr; register SV* sv; register SV* svend; - sv_root = (SV*)malloc(1008); - sv = sv_root; - svend = &sv[1008 / sizeof(SV) - 1]; + Zero(sva, size, char); + + /* The first SV in an arena isn't an SV. */ + SvANY(sva) = (void *) sv_arenaroot; /* ptr to next arena */ + SvREFCNT(sva) = size / sizeof(SV); /* number of SV slots */ + SvFLAGS(sva) = flags; /* FAKE if not to be freed */ + + sv_arenaroot = sva; + sv_root = sva + 1; + + svend = &sva[SvREFCNT(sva) - 1]; + sv = sva + 1; while (sv < svend) { - SvANY(sv) = (SV*)(sv + 1); + SvANY(sv) = (void *)(SV*)(sv + 1); + SvFLAGS(sv) = SVTYPEMASK; sv++; } SvANY(sv) = 0; - return new_sv(); + SvFLAGS(sv) = SVTYPEMASK; +} + +static SV* +more_sv() +{ + register SV* sv; + + if (nice_chunk) { + sv_add_arena(nice_chunk, nice_chunk_size, 0); + nice_chunk = Nullch; + } + else { + char *chunk; /* must use New here to match call to */ + New(704,chunk,1008,char); /* Safefree() in sv_free_arenas() */ + sv_add_arena(chunk, 1008, 0); + } + uproot_SV(sv); + return sv; +} + +static void +visit(f) +SVFUNC f; +{ + SV* sva; + SV* sv; + register SV* svend; + + for (sva = sv_arenaroot; sva; sva = (SV*)SvANY(sva)) { + svend = &sva[SvREFCNT(sva)]; + for (sv = sva + 1; sv < svend; ++sv) { + if (SvTYPE(sv) != SVTYPEMASK) + (*f)(sv); + } + } +} + +#endif /* PURIFY */ + +static void +do_report_used(sv) +SV* sv; +{ + if (SvTYPE(sv) != SVTYPEMASK) { + /* XXX Perhaps this ought to go to Perl_debug_log, if DEBUGGING. */ + PerlIO_printf(PerlIO_stderr(), "****\n"); + sv_dump(sv); + } +} + +void +sv_report_used() +{ + visit(do_report_used); +} + +static void +do_clean_objs(sv) +SV* sv; +{ + SV* rv; + + if (SvROK(sv) && SvOBJECT(rv = SvRV(sv))) { + DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning object ref:\n "), sv_dump(sv));) + SvROK_off(sv); + SvRV(sv) = 0; + SvREFCNT_dec(rv); + } + + /* XXX Might want to check arrays, etc. */ +} + +#ifndef DISABLE_DESTRUCTOR_KLUDGE +static void +do_clean_named_objs(sv) +SV* sv; +{ + if (SvTYPE(sv) == SVt_PVGV && GvSV(sv)) + do_clean_objs(GvSV(sv)); +} +#endif + +void +sv_clean_objs() +{ +#ifndef DISABLE_DESTRUCTOR_KLUDGE + visit(do_clean_named_objs); +#endif + visit(do_clean_objs); +} + +static void +do_clean_all(sv) +SV* sv; +{ + DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning loops:\n "), sv_dump(sv));) + SvFLAGS(sv) |= SVf_BREAK; + SvREFCNT_dec(sv); +} + +static int in_clean_all = 0; + +void +sv_clean_all() +{ + in_clean_all = 1; + visit(do_clean_all); + in_clean_all = 0; } -static I32* xiv_root; +void +sv_free_arenas() +{ + SV* sva; + SV* svanext; + + /* Free arenas here, but be careful about fake ones. (We assume + contiguity of the fake ones with the corresponding real ones.) */ -static XPVIV* more_xiv(); + for (sva = sv_arenaroot; sva; sva = svanext) { + svanext = (SV*) SvANY(sva); + while (svanext && SvFAKE(svanext)) + svanext = (SV*) SvANY(svanext); + + if (!SvFAKE(sva)) + Safefree((void *)sva); + } +} static XPVIV* new_xiv() { - I32* xiv; + IV** xiv; if (xiv_root) { xiv = xiv_root; - xiv_root = *(I32**)xiv; + /* + * See comment in more_xiv() -- RAM. + */ + xiv_root = (IV**)*xiv; return (XPVIV*)((char*)xiv - sizeof(XPV)); } return more_xiv(); @@ -111,33 +394,32 @@ static void del_xiv(p) XPVIV* p; { - I32* xiv = (I32*)((char*)(p) + sizeof(XPV)); - *(I32**)xiv = xiv_root; + IV** xiv = (IV**)((char*)(p) + sizeof(XPV)); + *xiv = (IV *)xiv_root; xiv_root = xiv; } static XPVIV* more_xiv() { - register int i; - register I32* xiv; - register I32* xivend; - xiv = (I32*)malloc(1008); - xivend = &xiv[1008 / sizeof(I32) - 1]; - xiv += (sizeof(XPV) - 1) / sizeof(I32) + 1; /* fudge by size of XPV */ + register IV** xiv; + register IV** xivend; + XPV* ptr = (XPV*)safemalloc(1008); + ptr->xpv_pv = (char*)xiv_arenaroot; /* linked list of xiv arenas */ + xiv_arenaroot = ptr; /* to keep Purify happy */ + + xiv = (IV**) ptr; + xivend = &xiv[1008 / sizeof(IV *) - 1]; + xiv += (sizeof(XPV) - 1) / sizeof(IV *) + 1; /* fudge by size of XPV */ xiv_root = xiv; while (xiv < xivend) { - *(I32**)xiv = (I32*)(xiv + 1); /* XXX busted on Alpha? */ + *xiv = (IV *)(xiv + 1); xiv++; } - *(I32**)xiv = 0; + *xiv = 0; return new_xiv(); } -static double* xnv_root; - -static XPVNV* more_xnv(); - static XPVNV* new_xnv() { @@ -162,10 +444,9 @@ XPVNV* p; static XPVNV* more_xnv() { - register int i; register double* xnv; register double* xnvend; - xnv = (double*)malloc(1008); + xnv = (double*)safemalloc(1008); xnvend = &xnv[1008 / sizeof(double) - 1]; xnv += (sizeof(XPVIV) - 1) / sizeof(double) + 1; /* fudge by sizeof XPVIV */ xnv_root = xnv; @@ -177,9 +458,41 @@ more_xnv() return new_xnv(); } -static XPV* xpv_root; +static XRV* +new_xrv() +{ + XRV* xrv; + if (xrv_root) { + xrv = xrv_root; + xrv_root = (XRV*)xrv->xrv_rv; + return xrv; + } + return more_xrv(); +} + +static void +del_xrv(p) +XRV* p; +{ + p->xrv_rv = (SV*)xrv_root; + xrv_root = p; +} -static XPV* more_xpv(); +static XRV* +more_xrv() +{ + register XRV* xrv; + register XRV* xrvend; + xrv_root = (XRV*)safemalloc(1008); + xrv = xrv_root; + xrvend = &xrv[1008 / sizeof(XRV) - 1]; + while (xrv < xrvend) { + xrv->xrv_rv = (SV*)(xrv + 1); + xrv++; + } + xrv->xrv_rv = 0; + return new_xrv(); +} static XPV* new_xpv() @@ -204,10 +517,9 @@ XPV* p; static XPV* more_xpv() { - register int i; register XPV* xpv; register XPV* xpvend; - xpv_root = (XPV*)malloc(1008); + xpv_root = (XPV*)safemalloc(1008); xpv = xpv_root; xpvend = &xpv[1008 / sizeof(XPV) - 1]; while (xpv < xpvend) { @@ -219,77 +531,70 @@ more_xpv() } #ifdef PURIFY - -#define new_SV() sv = (SV*)malloc(sizeof(SV)) -#define del_SV(p) free((char*)p) - -#else - -#define new_SV() \ - if (sv_root) { \ - sv = sv_root; \ - sv_root = (SV*)SvANY(sv); \ - } \ - else \ - sv = more_sv(); -#define del_SV(p) del_sv(p) - -#endif - -#ifdef PURIFY -#define new_XIV() (void*)malloc(sizeof(XPVIV)) +#define new_XIV() (void*)safemalloc(sizeof(XPVIV)) #define del_XIV(p) free((char*)p) #else -#define new_XIV() new_xiv() +#define new_XIV() (void*)new_xiv() #define del_XIV(p) del_xiv(p) #endif #ifdef PURIFY -#define new_XNV() (void*)malloc(sizeof(XPVNV)) +#define new_XNV() (void*)safemalloc(sizeof(XPVNV)) #define del_XNV(p) free((char*)p) #else -#define new_XNV() new_xnv() +#define new_XNV() (void*)new_xnv() #define del_XNV(p) del_xnv(p) #endif #ifdef PURIFY -#define new_XPV() (void*)malloc(sizeof(XPV)) +#define new_XRV() (void*)safemalloc(sizeof(XRV)) +#define del_XRV(p) free((char*)p) +#else +#define new_XRV() (void*)new_xrv() +#define del_XRV(p) del_xrv(p) +#endif + +#ifdef PURIFY +#define new_XPV() (void*)safemalloc(sizeof(XPV)) #define del_XPV(p) free((char*)p) #else -#define new_XPV() new_xpv() +#define new_XPV() (void*)new_xpv() #define del_XPV(p) del_xpv(p) #endif -#define new_XPVIV() (void*)malloc(sizeof(XPVIV)) +#define new_XPVIV() (void*)safemalloc(sizeof(XPVIV)) #define del_XPVIV(p) free((char*)p) -#define new_XPVNV() (void*)malloc(sizeof(XPVNV)) +#define new_XPVNV() (void*)safemalloc(sizeof(XPVNV)) #define del_XPVNV(p) free((char*)p) -#define new_XPVMG() (void*)malloc(sizeof(XPVMG)) +#define new_XPVMG() (void*)safemalloc(sizeof(XPVMG)) #define del_XPVMG(p) free((char*)p) -#define new_XPVLV() (void*)malloc(sizeof(XPVLV)) +#define new_XPVLV() (void*)safemalloc(sizeof(XPVLV)) #define del_XPVLV(p) free((char*)p) -#define new_XPVAV() (void*)malloc(sizeof(XPVAV)) +#define new_XPVAV() (void*)safemalloc(sizeof(XPVAV)) #define del_XPVAV(p) free((char*)p) -#define new_XPVHV() (void*)malloc(sizeof(XPVHV)) +#define new_XPVHV() (void*)safemalloc(sizeof(XPVHV)) #define del_XPVHV(p) free((char*)p) -#define new_XPVCV() (void*)malloc(sizeof(XPVCV)) +#define new_XPVCV() (void*)safemalloc(sizeof(XPVCV)) #define del_XPVCV(p) free((char*)p) -#define new_XPVGV() (void*)malloc(sizeof(XPVGV)) +#define new_XPVGV() (void*)safemalloc(sizeof(XPVGV)) #define del_XPVGV(p) free((char*)p) -#define new_XPVBM() (void*)malloc(sizeof(XPVBM)) +#define new_XPVBM() (void*)safemalloc(sizeof(XPVBM)) #define del_XPVBM(p) free((char*)p) -#define new_XPVFM() (void*)malloc(sizeof(XPVFM)) +#define new_XPVFM() (void*)safemalloc(sizeof(XPVFM)) #define del_XPVFM(p) free((char*)p) +#define new_XPVIO() (void*)safemalloc(sizeof(XPVIO)) +#define del_XPVIO(p) free((char*)p) + bool sv_upgrade(sv, mt) register SV* sv; @@ -298,7 +603,7 @@ U32 mt; char* pv; U32 cur; U32 len; - I32 iv; + IV iv; double nv; MAGIC* magic; HV* stash; @@ -306,6 +611,9 @@ U32 mt; if (SvTYPE(sv) == mt) return TRUE; + if (mt < SVt_PVIV) + (void)SvOOK_off(sv); + switch (SvTYPE(sv)) { case SVt_NULL: pv = 0; @@ -316,19 +624,6 @@ U32 mt; magic = 0; stash = 0; break; - case SVt_REF: - sv_free((SV*)SvANY(sv)); - pv = 0; - cur = 0; - len = 0; - iv = (I32)SvANY(sv); - nv = (double)(unsigned long)SvANY(sv); - SvNOK_only(sv); - magic = 0; - stash = 0; - if (mt == SVt_PV) - mt = SVt_PVIV; - break; case SVt_IV: pv = 0; cur = 0; @@ -338,26 +633,35 @@ U32 mt; del_XIV(SvANY(sv)); magic = 0; stash = 0; - if (mt == SVt_PV) - mt = SVt_PVIV; - else if (mt == SVt_NV) + if (mt == SVt_NV) mt = SVt_PVNV; + else if (mt < SVt_PVIV) + mt = SVt_PVIV; break; case SVt_NV: pv = 0; cur = 0; len = 0; nv = SvNVX(sv); - iv = (I32)nv; + iv = I_32(nv); magic = 0; stash = 0; del_XNV(SvANY(sv)); SvANY(sv) = 0; - if (mt == SVt_PV || mt == SVt_PVIV) + if (mt < SVt_PVNV) mt = SVt_PVNV; break; + case SVt_RV: + pv = (char*)SvRV(sv); + cur = 0; + len = 0; + iv = (IV)pv; + nv = (double)(unsigned long)pv; + del_XRV(SvANY(sv)); + magic = 0; + stash = 0; + break; case SVt_PV: - nv = 0.0; pv = SvPVX(sv); cur = SvCUR(sv); len = SvLEN(sv); @@ -366,9 +670,12 @@ U32 mt; magic = 0; stash = 0; del_XPV(SvANY(sv)); + if (mt <= SVt_IV) + mt = SVt_PVIV; + else if (mt == SVt_NV) + mt = SVt_PVNV; break; case SVt_PVIV: - nv = 0.0; pv = SvPVX(sv); cur = SvCUR(sv); len = SvLEN(sv); @@ -379,7 +686,6 @@ U32 mt; del_XPVIV(SvANY(sv)); break; case SVt_PVNV: - nv = SvNVX(sv); pv = SvPVX(sv); cur = SvCUR(sv); len = SvLEN(sv); @@ -406,9 +712,6 @@ U32 mt; switch (mt) { case SVt_NULL: croak("Can't upgrade to undef"); - case SVt_REF: - SvOK_on(sv); - break; case SVt_IV: SvANY(sv) = new_XIV(); SvIVX(sv) = iv; @@ -417,6 +720,10 @@ U32 mt; SvANY(sv) = new_XNV(); SvNVX(sv) = nv; break; + case SVt_RV: + SvANY(sv) = new_XRV(); + SvRV(sv) = (SV*)pv; + break; case SVt_PV: SvANY(sv) = new_XPV(); SvPVX(sv) = pv; @@ -430,7 +737,7 @@ U32 mt; SvLEN(sv) = len; SvIVX(sv) = iv; if (SvNIOK(sv)) - SvIOK_on(sv); + (void)SvIOK_on(sv); SvNOK_off(sv); break; case SVt_PVNV: @@ -469,9 +776,9 @@ U32 mt; SvANY(sv) = new_XPVAV(); if (pv) Safefree(pv); - AvARRAY(sv) = 0; - AvMAX(sv) = 0; - AvFILL(sv) = 0; + SvPVX(sv) = 0; + AvMAX(sv) = -1; + AvFILL(sv) = -1; SvIVX(sv) = 0; SvNVX(sv) = 0.0; SvMAGIC(sv) = magic; @@ -498,6 +805,7 @@ U32 mt; break; case SVt_PVCV: SvANY(sv) = new_XPVCV(); + Zero(SvANY(sv), 1, XPVCV); SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; @@ -505,15 +813,6 @@ U32 mt; SvNVX(sv) = nv; SvMAGIC(sv) = magic; SvSTASH(sv) = stash; - CvSTASH(sv) = 0; - CvSTART(sv) = 0; - CvROOT(sv) = 0; - CvUSERSUB(sv) = 0; - CvUSERINDEX(sv) = 0; - CvFILEGV(sv) = 0; - CvDEPTH(sv) = 0; - CvPADLIST(sv) = 0; - CvDELETED(sv) = 0; break; case SVt_PVGV: SvANY(sv) = new_XPVGV(); @@ -528,6 +827,7 @@ U32 mt; GvNAME(sv) = 0; GvNAMELEN(sv) = 0; GvSTASH(sv) = 0; + GvFLAGS(sv) = 0; break; case SVt_PVBM: SvANY(sv) = new_XPVBM(); @@ -544,6 +844,7 @@ U32 mt; break; case SVt_PVFM: SvANY(sv) = new_XPVFM(); + Zero(SvANY(sv), 1, XPVFM); SvPVX(sv) = pv; SvCUR(sv) = cur; SvLEN(sv) = len; @@ -551,110 +852,171 @@ U32 mt; SvNVX(sv) = nv; SvMAGIC(sv) = magic; SvSTASH(sv) = stash; - FmLINES(sv) = 0; + break; + case SVt_PVIO: + SvANY(sv) = new_XPVIO(); + Zero(SvANY(sv), 1, XPVIO); + SvPVX(sv) = pv; + SvCUR(sv) = cur; + SvLEN(sv) = len; + SvIVX(sv) = iv; + SvNVX(sv) = nv; + SvMAGIC(sv) = magic; + SvSTASH(sv) = stash; + IoPAGE_LEN(sv) = 60; break; } - SvTYPE(sv) = mt; + SvFLAGS(sv) &= ~SVTYPEMASK; + SvFLAGS(sv) |= mt; return TRUE; } +#ifdef DEBUGGING char * sv_peek(sv) register SV *sv; { char *t = tokenbuf; - *t = '\0'; + int unref = 0; retry: if (!sv) { strcpy(t, "VOID"); - return tokenbuf; + goto finish; } else if (sv == (SV*)0x55555555 || SvTYPE(sv) == 'U') { strcpy(t, "WILD"); - return tokenbuf; - } - else if (SvREFCNT(sv) == 0 && !SvREADONLY(sv)) { - strcpy(t, "UNREF"); - return tokenbuf; + goto finish; + } + else if (sv == &sv_undef || sv == &sv_no || sv == &sv_yes) { + if (sv == &sv_undef) { + strcpy(t, "SV_UNDEF"); + if (!(SvFLAGS(sv) & (SVf_OK|SVf_OOK|SVs_OBJECT| + SVs_GMG|SVs_SMG|SVs_RMG)) && + SvREADONLY(sv)) + goto finish; + } + else if (sv == &sv_no) { + strcpy(t, "SV_NO"); + if (!(SvFLAGS(sv) & (SVf_ROK|SVf_OOK|SVs_OBJECT| + SVs_GMG|SVs_SMG|SVs_RMG)) && + !(~SvFLAGS(sv) & (SVf_POK|SVf_NOK|SVf_READONLY| + SVp_POK|SVp_NOK)) && + SvCUR(sv) == 0 && + SvNVX(sv) == 0.0) + goto finish; + } + else { + strcpy(t, "SV_YES"); + if (!(SvFLAGS(sv) & (SVf_ROK|SVf_OOK|SVs_OBJECT| + SVs_GMG|SVs_SMG|SVs_RMG)) && + !(~SvFLAGS(sv) & (SVf_POK|SVf_NOK|SVf_READONLY| + SVp_POK|SVp_NOK)) && + SvCUR(sv) == 1 && + SvPVX(sv) && *SvPVX(sv) == '1' && + SvNVX(sv) == 1.0) + goto finish; + } + t += strlen(t); + *t++ = ':'; + } + else if (SvREFCNT(sv) == 0) { + *t++ = '('; + unref++; + } + if (SvROK(sv)) { + *t++ = '\\'; + if (t - tokenbuf + unref > 10) { + strcpy(tokenbuf + unref + 3,"..."); + goto finish; + } + sv = (SV*)SvRV(sv); + goto retry; } - else { - switch (SvTYPE(sv)) { - default: - strcpy(t,"FREED"); - return tokenbuf; - break; + switch (SvTYPE(sv)) { + default: + strcpy(t,"FREED"); + goto finish; - case SVt_NULL: - strcpy(t,"UNDEF"); - return tokenbuf; - case SVt_REF: - *t++ = '\\'; - if (t - tokenbuf > 10) { - strcpy(tokenbuf + 3,"..."); - return tokenbuf; - } - sv = (SV*)SvANY(sv); - goto retry; - case SVt_IV: - strcpy(t,"IV"); - break; - case SVt_NV: - strcpy(t,"NV"); - break; - case SVt_PV: - strcpy(t,"PV"); - break; - case SVt_PVIV: - strcpy(t,"PVIV"); - break; - case SVt_PVNV: - strcpy(t,"PVNV"); - break; - case SVt_PVMG: - strcpy(t,"PVMG"); - break; - case SVt_PVLV: - strcpy(t,"PVLV"); - break; - case SVt_PVAV: - strcpy(t,"AV"); - break; - case SVt_PVHV: - strcpy(t,"HV"); - break; - case SVt_PVCV: - strcpy(t,"CV"); - break; - case SVt_PVGV: - strcpy(t,"GV"); - break; - case SVt_PVBM: - strcpy(t,"BM"); - break; - case SVt_PVFM: - strcpy(t,"FM"); - break; - } + case SVt_NULL: + strcpy(t,"UNDEF"); + return tokenbuf; + case SVt_IV: + strcpy(t,"IV"); + break; + case SVt_NV: + strcpy(t,"NV"); + break; + case SVt_RV: + strcpy(t,"RV"); + break; + case SVt_PV: + strcpy(t,"PV"); + break; + case SVt_PVIV: + strcpy(t,"PVIV"); + break; + case SVt_PVNV: + strcpy(t,"PVNV"); + break; + case SVt_PVMG: + strcpy(t,"PVMG"); + break; + case SVt_PVLV: + strcpy(t,"PVLV"); + break; + case SVt_PVAV: + strcpy(t,"AV"); + break; + case SVt_PVHV: + strcpy(t,"HV"); + break; + case SVt_PVCV: + if (CvGV(sv)) + sprintf(t, "CV(%s)", GvNAME(CvGV(sv))); + else + strcpy(t, "CV()"); + goto finish; + case SVt_PVGV: + strcpy(t,"GV"); + break; + case SVt_PVBM: + strcpy(t,"BM"); + break; + case SVt_PVFM: + strcpy(t,"FM"); + break; + case SVt_PVIO: + strcpy(t,"IO"); + break; } t += strlen(t); - if (SvPOK(sv)) { + if (SvPOKp(sv)) { if (!SvPVX(sv)) - return "(null)"; + strcpy(t, "(null)"); if (SvOOK(sv)) - sprintf(t,"(%d+\"%0.127s\")",SvIVX(sv),SvPVX(sv)); + sprintf(t,"(%ld+\"%.127s\")",(long)SvIVX(sv),SvPVX(sv)); else - sprintf(t,"(\"%0.127s\")",SvPVX(sv)); + sprintf(t,"(\"%.127s\")",SvPVX(sv)); } - else if (SvNOK(sv)) + else if (SvNOKp(sv)) sprintf(t,"(%g)",SvNVX(sv)); - else if (SvIOK(sv)) + else if (SvIOKp(sv)) sprintf(t,"(%ld)",(long)SvIVX(sv)); else strcpy(t,"()"); + + finish: + if (unref) { + t += strlen(t); + while (unref--) + *t++ = ')'; + *t = '\0'; + } return tokenbuf; } +#endif int sv_backoff(sv) @@ -669,6 +1031,7 @@ register SV *sv; Move(s, SvPVX(sv), SvCUR(sv)+1, char); } SvFLAGS(sv) &= ~SVf_OOK; + return 0; } char * @@ -684,12 +1047,12 @@ unsigned long newlen; #ifdef MSDOS if (newlen >= 0x10000) { - fprintf(stderr, "Allocation too large: %lx\n", newlen); + PerlIO_printf(Perl_debug_log, "Allocation too large: %lx\n", newlen); my_exit(1); } #endif /* MSDOS */ - if (SvREADONLY(sv)) - croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); if (SvTYPE(sv) < SVt_PV) { sv_upgrade(sv, SVt_PV); s = SvPVX(sv); @@ -703,7 +1066,7 @@ unsigned long newlen; else s = SvPVX(sv); if (newlen > SvLEN(sv)) { /* need more room? */ - if (SvLEN(sv)) + if (SvLEN(sv) && s) Renew(s,newlen,char); else New(703,s,newlen,char); @@ -716,24 +1079,42 @@ unsigned long newlen; void sv_setiv(sv,i) register SV *sv; -I32 i; +IV i; { - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } switch (SvTYPE(sv)) { case SVt_NULL: - case SVt_REF: sv_upgrade(sv, SVt_IV); break; case SVt_NV: sv_upgrade(sv, SVt_PVNV); break; + case SVt_RV: case SVt_PV: sv_upgrade(sv, SVt_PVIV); break; + + case SVt_PVGV: + if (SvFAKE(sv)) { + sv_unglob(sv); + break; + } + /* FALL THROUGH */ + case SVt_PVAV: + case SVt_PVHV: + case SVt_PVCV: + case SVt_PVFM: + case SVt_PVIO: + croak("Can't coerce %s to integer in %s", sv_reftype(sv,0), + op_name[op->op_type]); } + (void)SvIOK_only(sv); /* validate number */ SvIVX(sv) = i; - SvIOK_only(sv); /* validate number */ SvTAINT(sv); } @@ -742,48 +1123,138 @@ sv_setnv(sv,num) register SV *sv; double num; { - if (SvREADONLY(sv)) - croak(no_modify); - if (SvTYPE(sv) < SVt_NV) + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } + switch (SvTYPE(sv)) { + case SVt_NULL: + case SVt_IV: sv_upgrade(sv, SVt_NV); - else if (SvTYPE(sv) < SVt_PVNV) + break; + case SVt_NV: + case SVt_RV: + case SVt_PV: + case SVt_PVIV: sv_upgrade(sv, SVt_PVNV); - else if (SvPOK(sv)) { - SvOOK_off(sv); + /* FALL THROUGH */ + case SVt_PVNV: + case SVt_PVMG: + case SVt_PVBM: + case SVt_PVLV: + if (SvOOK(sv)) + (void)SvOOK_off(sv); + break; + case SVt_PVGV: + if (SvFAKE(sv)) { + sv_unglob(sv); + break; + } + /* FALL THROUGH */ + case SVt_PVAV: + case SVt_PVHV: + case SVt_PVCV: + case SVt_PVFM: + case SVt_PVIO: + croak("Can't coerce %s to number in %s", sv_reftype(sv,0), + op_name[op->op_type]); } SvNVX(sv) = num; - SvNOK_only(sv); /* validate number */ + (void)SvNOK_only(sv); /* validate number */ SvTAINT(sv); } -I32 +static void +not_a_number(sv) +SV *sv; +{ + char tmpbuf[64]; + char *d = tmpbuf; + char *s; + int i; + + for (s = SvPVX(sv), i = 50; *s && i; s++,i--) { + int ch = *s; + if (ch & 128 && !isprint(ch)) { + *d++ = 'M'; + *d++ = '-'; + ch &= 127; + } + if (isprint(ch)) + *d++ = ch; + else { + *d++ = '^'; + *d++ = ch ^ 64; + } + } + if (*s) { + *d++ = '.'; + *d++ = '.'; + *d++ = '.'; + } + *d = '\0'; + + if (op) + warn("Argument \"%s\" isn't numeric in %s", tmpbuf, + op_name[op->op_type]); + else + warn("Argument \"%s\" isn't numeric", tmpbuf); +} + +IV sv_2iv(sv) register SV *sv; { if (!sv) return 0; - if (SvMAGICAL(sv)) { + if (SvGMAGICAL(sv)) { mg_get(sv); if (SvIOKp(sv)) return SvIVX(sv); - if (SvNOKp(sv)) - return (I32)SvNVX(sv); - if (SvPOKp(sv) && SvLEN(sv)) - return (I32)atol(SvPVX(sv)); - return 0; - } - if (SvREADONLY(sv)) { - if (SvNOK(sv)) - return (I32)SvNVX(sv); - if (SvPOK(sv) && SvLEN(sv)) - return (I32)atol(SvPVX(sv)); - if (dowarn) - warn("Use of uninitialized variable"); - return 0; + if (SvNOKp(sv)) { + if (SvNVX(sv) < 0.0) + return I_V(SvNVX(sv)); + else + return (IV) U_V(SvNVX(sv)); + } + if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !looks_like_number(sv)) + not_a_number(sv); + return (IV)atol(SvPVX(sv)); + } + if (!SvROK(sv)) { + return 0; + } + } + if (SvTHINKFIRST(sv)) { + if (SvROK(sv)) { +#ifdef OVERLOAD + SV* tmpstr; + if (SvAMAGIC(sv) && (tmpstr=AMG_CALLun(sv, numer))) + return SvIV(tmpstr); +#endif /* OVERLOAD */ + return (IV)SvRV(sv); + } + if (SvREADONLY(sv)) { + if (SvNOKp(sv)) { + if (SvNVX(sv) < 0.0) + return I_V(SvNVX(sv)); + else + return (IV) U_V(SvNVX(sv)); + } + if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !looks_like_number(sv)) + not_a_number(sv); + return (IV)atol(SvPVX(sv)); + } + if (dowarn) + warn(warn_uninit); + return 0; + } } switch (SvTYPE(sv)) { - case SVt_REF: - return (I32)SvANY(sv); case SVt_NULL: sv_upgrade(sv, SVt_IV); return SvIVX(sv); @@ -794,25 +1265,27 @@ register SV *sv; sv_upgrade(sv, SVt_PVNV); break; } - if (SvNOK(sv)) - SvIVX(sv) = (I32)SvNVX(sv); - else if (SvPOK(sv) && SvLEN(sv)) { - if (dowarn && !looks_like_number(sv)) { - if (op) - warn("Argument wasn't numeric for \"%s\"",op_name[op->op_type]); - else - warn("Argument wasn't numeric"); - } - SvIVX(sv) = (I32)atol(SvPVX(sv)); + if (SvNOKp(sv)) { + (void)SvIOK_on(sv); + if (SvNVX(sv) < 0.0) + SvIVX(sv) = I_V(SvNVX(sv)); + else + SvIVX(sv) = (IV) U_V(SvNVX(sv)); + } + else if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !looks_like_number(sv)) + not_a_number(sv); + (void)SvIOK_on(sv); + SvIVX(sv) = (IV)atol(SvPVX(sv)); } else { - if (dowarn) - warn("Use of uninitialized variable"); - SvUPGRADE(sv, SVt_IV); - SvIVX(sv) = 0; + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0; } - SvIOK_on(sv); - DEBUG_c((stderr,"0x%lx 2iv(%d)\n",sv,SvIVX(sv))); + (void)SvIOK_on(sv); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2iv(%ld)\n", + (unsigned long)sv,(long)SvIVX(sv))); return SvIVX(sv); } @@ -822,56 +1295,69 @@ register SV *sv; { if (!sv) return 0.0; - if (SvMAGICAL(sv)) { + if (SvGMAGICAL(sv)) { mg_get(sv); if (SvNOKp(sv)) return SvNVX(sv); - if (SvPOKp(sv) && SvLEN(sv)) + if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !SvIOKp(sv) && !looks_like_number(sv)) + not_a_number(sv); return atof(SvPVX(sv)); + } if (SvIOKp(sv)) return (double)SvIVX(sv); - return 0; - } - if (SvREADONLY(sv)) { - if (SvPOK(sv) && SvLEN(sv)) - return atof(SvPVX(sv)); - if (dowarn) - warn("Use of uninitialized variable"); - return 0.0; + if (!SvROK(sv)) { + return 0; + } + } + if (SvTHINKFIRST(sv)) { + if (SvROK(sv)) { +#ifdef OVERLOAD + SV* tmpstr; + if (SvAMAGIC(sv) && (tmpstr=AMG_CALLun(sv,numer))) + return SvNV(tmpstr); +#endif /* OVERLOAD */ + return (double)(unsigned long)SvRV(sv); + } + if (SvREADONLY(sv)) { + if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !SvIOKp(sv) && !looks_like_number(sv)) + not_a_number(sv); + return atof(SvPVX(sv)); + } + if (SvIOKp(sv)) + return (double)SvIVX(sv); + if (dowarn) + warn(warn_uninit); + return 0.0; + } } if (SvTYPE(sv) < SVt_NV) { - if (SvTYPE(sv) == SVt_REF) - return (double)(unsigned long)SvANY(sv); if (SvTYPE(sv) == SVt_IV) sv_upgrade(sv, SVt_PVNV); else sv_upgrade(sv, SVt_NV); - DEBUG_c((stderr,"0x%lx num(%g)\n",sv,SvNVX(sv))); - return SvNVX(sv); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx num(%g)\n",(unsigned long)sv,SvNVX(sv))); } else if (SvTYPE(sv) < SVt_PVNV) sv_upgrade(sv, SVt_PVNV); - if (SvIOK(sv) && - (!SvPOK(sv) || !strchr(SvPVX(sv),'.') || !looks_like_number(sv))) + if (SvIOKp(sv) && + (!SvPOKp(sv) || !strchr(SvPVX(sv),'.') || !looks_like_number(sv))) { SvNVX(sv) = (double)SvIVX(sv); } - else if (SvPOK(sv) && SvLEN(sv)) { - if (dowarn && !SvIOK(sv) && !looks_like_number(sv)) { - if (op) - warn("Argument wasn't numeric for \"%s\"",op_name[op->op_type]); - else - warn("Argument wasn't numeric"); - } + else if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !SvIOKp(sv) && !looks_like_number(sv)) + not_a_number(sv); SvNVX(sv) = atof(SvPVX(sv)); } else { - if (dowarn) - warn("Use of uninitialized variable"); - SvNVX(sv) = 0.0; + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0.0; } SvNOK_on(sv); - DEBUG_c((stderr,"0x%lx 2nv(%g)\n",sv,SvNVX(sv))); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2nv(%g)\n",(unsigned long)sv,SvNVX(sv))); return SvNVX(sv); } @@ -887,121 +1373,153 @@ STRLEN *lp; *lp = 0; return ""; } - if (SvMAGICAL(sv)) { + if (SvGMAGICAL(sv)) { mg_get(sv); if (SvPOKp(sv)) { *lp = SvCUR(sv); return SvPVX(sv); } if (SvIOKp(sv)) { - (void)sprintf(tokenbuf,"%ld",SvIVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + (void)sprintf(tokenbuf,"%ld",(long)SvIVX(sv)); + goto tokensave; } if (SvNOKp(sv)) { - (void)sprintf(tokenbuf,"%.20g",SvNVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + Gconvert(SvNVX(sv), DBL_DIG, 0, tokenbuf); + goto tokensave; } - *lp = 0; - return ""; - } - if (SvTYPE(sv) == SVt_REF) { - sv = (SV*)SvANY(sv); - if (!sv) - s = "NULLREF"; - else { - switch (SvTYPE(sv)) { - case SVt_NULL: - case SVt_REF: - case SVt_IV: - case SVt_NV: - case SVt_PV: - case SVt_PVIV: - case SVt_PVNV: - case SVt_PVMG: s = "SCALAR"; break; - case SVt_PVLV: s = "LVALUE"; break; - case SVt_PVAV: s = "ARRAY"; break; - case SVt_PVHV: s = "HASH"; break; - case SVt_PVCV: s = "CODE"; break; - case SVt_PVGV: s = "GLOB"; break; - case SVt_PVBM: s = "SEARCHSTRING"; break; - case SVt_PVFM: s = "FORMATLINE"; break; - default: s = "UNKNOWN"; break; + if (!SvROK(sv)) { + *lp = 0; + return ""; + } + } + if (SvTHINKFIRST(sv)) { + if (SvROK(sv)) { +#ifdef OVERLOAD + SV* tmpstr; + if (SvAMAGIC(sv) && (tmpstr=AMG_CALLun(sv,string))) + return SvPV(tmpstr,*lp); +#endif /* OVERLOAD */ + sv = (SV*)SvRV(sv); + if (!sv) + s = "NULLREF"; + else { + switch (SvTYPE(sv)) { + case SVt_NULL: + case SVt_IV: + case SVt_NV: + case SVt_RV: + case SVt_PV: + case SVt_PVIV: + case SVt_PVNV: + case SVt_PVBM: + case SVt_PVMG: s = "SCALAR"; break; + case SVt_PVLV: s = "LVALUE"; break; + case SVt_PVAV: s = "ARRAY"; break; + case SVt_PVHV: s = "HASH"; break; + case SVt_PVCV: s = "CODE"; break; + case SVt_PVGV: s = "GLOB"; break; + case SVt_PVFM: s = "FORMATLINE"; break; + case SVt_PVIO: s = "FILEHANDLE"; break; + default: s = "UNKNOWN"; break; + } + if (SvOBJECT(sv)) + sprintf(tokenbuf, "%s=%s(0x%lx)", + HvNAME(SvSTASH(sv)), s, (unsigned long)sv); + else + sprintf(tokenbuf, "%s(0x%lx)", s, (unsigned long)sv); + goto tokensaveref; } - if (SvSTORAGE(sv) == 'O') - sprintf(tokenbuf, "%s=%s(0x%lx)", - HvNAME(SvSTASH(sv)), s, (unsigned long)sv); - else - sprintf(tokenbuf, "%s(0x%lx)", s, (unsigned long)sv); - s = tokenbuf; + *lp = strlen(s); + return s; + } + if (SvREADONLY(sv)) { + if (SvNOKp(sv)) { + Gconvert(SvNVX(sv), DBL_DIG, 0, tokenbuf); + goto tokensave; + } + if (SvIOKp(sv)) { + (void)sprintf(tokenbuf,"%ld",(long)SvIVX(sv)); + goto tokensave; + } + if (dowarn) + warn(warn_uninit); + *lp = 0; + return ""; } - *lp = strlen(s); - return s; - } - if (SvREADONLY(sv)) { - if (SvIOK(sv)) { - (void)sprintf(tokenbuf,"%ld",SvIVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; - } - if (SvNOK(sv)) { - (void)sprintf(tokenbuf,"%.20g",SvNVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; - } - if (dowarn) - warn("Use of uninitialized variable"); - *lp = 0; - return ""; } if (!SvUPGRADE(sv, SVt_PV)) return 0; - if (SvNOK(sv)) { + if (SvNOKp(sv)) { if (SvTYPE(sv) < SVt_PVNV) sv_upgrade(sv, SVt_PVNV); SvGROW(sv, 28); s = SvPVX(sv); olderrno = errno; /* some Xenix systems wipe out errno here */ -#if defined(scs) && defined(ns32000) - gcvt(SvNVX(sv),20,s); -#else #ifdef apollo if (SvNVX(sv) == 0.0) (void)strcpy(s,"0"); else #endif /*apollo*/ - (void)sprintf(s,"%.20g",SvNVX(sv)); -#endif /*scs*/ + Gconvert(SvNVX(sv), DBL_DIG, 0, s); errno = olderrno; +#ifdef FIXNEGATIVEZERO + if (*s == '-' && s[1] == '0' && !s[2]) + strcpy(s,"0"); +#endif while (*s) s++; #ifdef hcx if (s[-1] == '.') s--; #endif } - else if (SvIOK(sv)) { + else if (SvIOKp(sv)) { if (SvTYPE(sv) < SVt_PVIV) sv_upgrade(sv, SVt_PVIV); SvGROW(sv, 11); s = SvPVX(sv); olderrno = errno; /* some Xenix systems wipe out errno here */ - (void)sprintf(s,"%ld",SvIVX(sv)); + (void)sprintf(s,"%ld",(long)SvIVX(sv)); errno = olderrno; while (*s) s++; } else { - if (dowarn) - warn("Use of uninitialized variable"); - sv_grow(sv, 1); - s = SvPVX(sv); + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + *lp = 0; + return ""; } *s = '\0'; *lp = s - SvPVX(sv); SvCUR_set(sv, *lp); SvPOK_on(sv); - DEBUG_c((stderr,"0x%lx 2pv(%s)\n",sv,SvPVX(sv))); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2pv(%s)\n",(unsigned long)sv,SvPVX(sv))); return SvPVX(sv); + + tokensave: + if (SvROK(sv)) { /* XXX Skip this when sv_pvn_force calls */ + /* Sneaky stuff here */ + + tokensaveref: + sv = sv_newmortal(); + *lp = strlen(tokenbuf); + sv_setpvn(sv, tokenbuf, *lp); + return SvPVX(sv); + } + else { + STRLEN len; + +#ifdef FIXNEGATIVEZERO + if (*tokenbuf == '-' && tokenbuf[1] == '0' && !tokenbuf[2]) + strcpy(tokenbuf,"0"); +#endif + (void)SvUPGRADE(sv, SVt_PV); + len = *lp = strlen(tokenbuf); + s = SvGROW(sv, len + 1); + SvCUR_set(sv, len); + (void)strcpy(s, tokenbuf); + /* NO SvPOK_on(sv) here! */ + return s; + } } /* This function is only called on magical items */ @@ -1009,11 +1527,21 @@ bool sv_2bool(sv) register SV *sv; { - if (SvMAGICAL(sv)) + if (SvGMAGICAL(sv)) mg_get(sv); - if (SvTYPE(sv) == SVt_REF) - return SvANY(sv) != 0; + if (!SvOK(sv)) + return 0; + if (SvROK(sv)) { +#ifdef OVERLOAD + { + SV* tmpsv; + if (SvAMAGIC(sv) && (tmpsv = AMG_CALLun(sv,bool_))) + return SvTRUE(tmpsv); + } +#endif /* OVERLOAD */ + return SvRV(sv) != 0; + } if (SvPOKp(sv)) { register XPV* Xpv; if ((Xpv = (XPV*)SvANY(sv)) && @@ -1046,115 +1574,244 @@ sv_setsv(dstr,sstr) SV *dstr; register SV *sstr; { - int flags; + register U32 sflags; + register int dtype; + register int stype; if (sstr == dstr) return; - if (SvREADONLY(dstr)) - croak(no_modify); + if (SvTHINKFIRST(dstr)) { + if (SvREADONLY(dstr) && curcop != &compiling) + croak(no_modify); + if (SvROK(dstr)) + sv_unref(dstr); + } if (!sstr) sstr = &sv_undef; + stype = SvTYPE(sstr); + dtype = SvTYPE(dstr); + if (dtype == SVt_PVGV && (SvFLAGS(dstr) & SVf_FAKE)) { + sv_unglob(dstr); /* so fake GLOB won't perpetuate */ + sv_setpvn(dstr, "", 0); + (void)SvPOK_only(dstr); + dtype = SvTYPE(dstr); + } + +#ifdef OVERLOAD + SvAMAGIC_off(dstr); +#endif /* OVERLOAD */ /* There's a lot of redundancy below but we're going for speed here */ - switch (SvTYPE(sstr)) { + switch (stype) { case SVt_NULL: - if (SvTYPE(dstr) == SVt_REF) { - sv_free((SV*)SvANY(dstr)); - SvANY(dstr) = 0; - SvTYPE(dstr) = SVt_NULL; - } - else - SvOK_off(dstr); - return; - case SVt_REF: - if (SvTYPE(dstr) < SVt_REF) - sv_upgrade(dstr, SVt_REF); - if (SvTYPE(dstr) == SVt_REF) { - sv_free((SV*)SvANY(dstr)); - SvANY(dstr) = 0; - SvANY(dstr) = (void*)sv_ref((SV*)SvANY(sstr)); - } - else { - if (SvMAGICAL(dstr)) - croak("Can't assign a reference to a magical variable"); - if (SvREFCNT(dstr) != 1) - warn("Reference miscount in sv_setsv()"); - SvREFCNT(dstr) = 0; - sv_clear(dstr); - SvTYPE(dstr) = SVt_REF; - SvANY(dstr) = (void*)sv_ref((SV*)SvANY(sstr)); - SvOK_off(dstr); - } - SvTAINT(sstr); + (void)SvOK_off(dstr); return; case SVt_IV: - if (SvTYPE(dstr) < SVt_IV) - sv_upgrade(dstr, SVt_IV); - else if (SvTYPE(dstr) == SVt_PV) - sv_upgrade(dstr, SVt_PVIV); - else if (SvTYPE(dstr) == SVt_NV) - sv_upgrade(dstr, SVt_PVNV); - flags = SvFLAGS(sstr); + if (dtype <= SVt_PV) { + if (dtype < SVt_IV) + sv_upgrade(dstr, SVt_IV); + else if (dtype == SVt_NV) + sv_upgrade(dstr, SVt_PVNV); + else if (dtype <= SVt_PV) + sv_upgrade(dstr, SVt_PVIV); + } break; case SVt_NV: - if (SvTYPE(dstr) < SVt_NV) - sv_upgrade(dstr, SVt_NV); - else if (SvTYPE(dstr) == SVt_PV) - sv_upgrade(dstr, SVt_PVNV); - else if (SvTYPE(dstr) == SVt_PVIV) - sv_upgrade(dstr, SVt_PVNV); - flags = SvFLAGS(sstr); + if (dtype <= SVt_PVIV) { + if (dtype < SVt_NV) + sv_upgrade(dstr, SVt_NV); + else if (dtype == SVt_PVIV) + sv_upgrade(dstr, SVt_PVNV); + else if (dtype <= SVt_PV) + sv_upgrade(dstr, SVt_PVNV); + } + break; + case SVt_RV: + if (dtype < SVt_RV) + sv_upgrade(dstr, SVt_RV); + else if (dtype == SVt_PVGV && + SvTYPE(SvRV(sstr)) == SVt_PVGV) { + sstr = SvRV(sstr); + if (sstr == dstr) { + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_on(dstr); + GvMULTI_on(dstr); + return; + } + goto glob_assign; + } break; case SVt_PV: - if (SvTYPE(dstr) < SVt_PV) + if (dtype < SVt_PV) sv_upgrade(dstr, SVt_PV); - flags = SvFLAGS(sstr); break; case SVt_PVIV: - if (SvTYPE(dstr) < SVt_PVIV) + if (dtype < SVt_PVIV) sv_upgrade(dstr, SVt_PVIV); - flags = SvFLAGS(sstr); break; case SVt_PVNV: - if (SvTYPE(dstr) < SVt_PVNV) + if (dtype < SVt_PVNV) sv_upgrade(dstr, SVt_PVNV); - flags = SvFLAGS(sstr); break; + + case SVt_PVLV: + sv_upgrade(dstr, SVt_PVLV); + break; + + case SVt_PVAV: + case SVt_PVHV: + case SVt_PVCV: + case SVt_PVIO: + if (op) + croak("Bizarre copy of %s in %s", sv_reftype(sstr, 0), + op_name[op->op_type]); + else + croak("Bizarre copy of %s", sv_reftype(sstr, 0)); + break; + case SVt_PVGV: - if (SvTYPE(dstr) <= SVt_PVGV) { - if (SvTYPE(dstr) < SVt_PVGV) + if (dtype <= SVt_PVGV) { + glob_assign: + if (dtype != SVt_PVGV) { + char *name = GvNAME(sstr); + STRLEN len = GvNAMELEN(sstr); sv_upgrade(dstr, SVt_PVGV); - SvOK_off(dstr); - if (!GvAV(sstr)) - gv_AVadd(sstr); - if (!GvHV(sstr)) - gv_HVadd(sstr); - if (!GvIO(sstr)) - GvIO(sstr) = newIO(); - if (GvGP(dstr)) - gp_free(dstr); + sv_magic(dstr, dstr, '*', name, len); + GvSTASH(dstr) = GvSTASH(sstr); + GvNAME(dstr) = savepvn(name, len); + GvNAMELEN(dstr) = len; + SvFAKE_on(dstr); /* can coerce to non-glob */ + } + (void)SvOK_off(dstr); + GvINTRO_off(dstr); /* one-shot flag */ + gp_free((GV*)dstr); GvGP(dstr) = gp_ref(GvGP(sstr)); - SvTAINT(sstr); + SvTAINT(dstr); + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_on(dstr); + GvMULTI_on(dstr); return; } /* FALL THROUGH */ default: - if (SvTYPE(dstr) < SvTYPE(sstr)) - sv_upgrade(dstr, SvTYPE(sstr)); - if (SvMAGICAL(sstr)) { + if (dtype < stype) + sv_upgrade(dstr, stype); + if (SvGMAGICAL(sstr)) mg_get(sstr); - flags = SvPRIVATE(sstr); - } - else - flags = SvFLAGS(sstr); } - - SvPRIVATE(dstr) = SvPRIVATE(sstr) & ~(SVf_IOK|SVf_POK|SVf_NOK); - - if (flags & SVf_POK) { + sflags = SvFLAGS(sstr); + + if (sflags & SVf_ROK) { + if (dtype >= SVt_PV) { + if (dtype == SVt_PVGV) { + SV *sref = SvREFCNT_inc(SvRV(sstr)); + SV *dref = 0; + int intro = GvINTRO(dstr); + + if (intro) { + GP *gp; + GvGP(dstr)->gp_refcnt--; + GvINTRO_off(dstr); /* one-shot flag */ + Newz(602,gp, 1, GP); + GvGP(dstr) = gp; + GvREFCNT(dstr) = 1; + GvSV(dstr) = NEWSV(72,0); + GvLINE(dstr) = curcop->cop_line; + GvEGV(dstr) = (GV*)dstr; + } + GvMULTI_on(dstr); + switch (SvTYPE(sref)) { + case SVt_PVAV: + if (intro) + SAVESPTR(GvAV(dstr)); + else + dref = (SV*)GvAV(dstr); + GvAV(dstr) = (AV*)sref; + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_AV_on(dstr); + break; + case SVt_PVHV: + if (intro) + SAVESPTR(GvHV(dstr)); + else + dref = (SV*)GvHV(dstr); + GvHV(dstr) = (HV*)sref; + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_HV_on(dstr); + break; + case SVt_PVCV: + if (intro) + SAVESPTR(GvCV(dstr)); + else { + CV* cv = GvCV(dstr); + if (cv) { + dref = (SV*)cv; + if (dowarn && sref != dref && + !GvCVGEN((GV*)dstr) && + (CvROOT(cv) || CvXSUB(cv)) ) + warn("Subroutine %s redefined", + GvENAME((GV*)dstr)); + SvFAKE_on(cv); + } + } + if (GvCV(dstr) != (CV*)sref) { + GvCV(dstr) = (CV*)sref; + GvASSUMECV_on(dstr); + } + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_CV_on(dstr); + break; + case SVt_PVIO: + if (intro) + SAVESPTR(GvIOp(dstr)); + else + dref = (SV*)GvIOp(dstr); + GvIOp(dstr) = (IO*)sref; + break; + default: + if (intro) + SAVESPTR(GvSV(dstr)); + else + dref = (SV*)GvSV(dstr); + GvSV(dstr) = sref; + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_SV_on(dstr); + break; + } + if (dref) + SvREFCNT_dec(dref); + if (intro) + SAVEFREESV(sref); + SvTAINT(dstr); + return; + } + if (SvPVX(dstr)) { + (void)SvOOK_off(dstr); /* backoff */ + Safefree(SvPVX(dstr)); + SvLEN(dstr)=SvCUR(dstr)=0; + } + } + (void)SvOK_off(dstr); + SvRV(dstr) = SvREFCNT_inc(SvRV(sstr)); + SvROK_on(dstr); + if (sflags & SVp_NOK) { + SvNOK_on(dstr); + SvNVX(dstr) = SvNVX(sstr); + } + if (sflags & SVp_IOK) { + (void)SvIOK_on(dstr); + SvIVX(dstr) = SvIVX(sstr); + } +#ifdef OVERLOAD + if (SvAMAGIC(sstr)) { + SvAMAGIC_on(dstr); + } +#endif /* OVERLOAD */ + } + else if (sflags & SVp_POK) { /* * Check to see if we can just swipe the string. If so, it's a @@ -1163,51 +1820,61 @@ register SV *sstr; * has to be allocated and SvPVX(sstr) has to be freed. */ - if (SvTEMP(sstr)) { /* slated for free anyway? */ - if (SvPOK(dstr)) { - SvOOK_off(dstr); - Safefree(SvPVX(dstr)); + if (SvTEMP(sstr) && /* slated for free anyway? */ + !(sflags & SVf_OOK)) /* and not involved in OOK hack? */ + { + if (SvPVX(dstr)) { /* we know that dtype >= SVt_PV */ + if (SvOOK(dstr)) { + SvFLAGS(dstr) &= ~SVf_OOK; + Safefree(SvPVX(dstr) - SvIVX(dstr)); + } + else + Safefree(SvPVX(dstr)); } + (void)SvPOK_only(dstr); SvPV_set(dstr, SvPVX(sstr)); SvLEN_set(dstr, SvLEN(sstr)); SvCUR_set(dstr, SvCUR(sstr)); - SvPOK_only(dstr); SvTEMP_off(dstr); + (void)SvOK_off(sstr); SvPV_set(sstr, Nullch); SvLEN_set(sstr, 0); - SvPOK_off(sstr); /* wipe out any weird flags */ - SvPVX(sstr) = 0; /* so sstr frees uneventfully */ + SvCUR_set(sstr, 0); + SvTEMP_off(sstr); } else { /* have to copy actual string */ - if (SvPVX(dstr)) { /* XXX ck type */ - SvOOK_off(dstr); - } - sv_setpvn(dstr,SvPVX(sstr),SvCUR(sstr)); + STRLEN len = SvCUR(sstr); + + SvGROW(dstr, len + 1); /* inlined from sv_setpvn */ + Move(SvPVX(sstr),SvPVX(dstr),len,char); + SvCUR_set(dstr, len); + *SvEND(dstr) = '\0'; + (void)SvPOK_only(dstr); } /*SUPPRESS 560*/ - if (flags & SVf_NOK) { + if (sflags & SVp_NOK) { SvNOK_on(dstr); SvNVX(dstr) = SvNVX(sstr); } - if (flags & SVf_IOK) { - SvIOK_on(dstr); + if (sflags & SVp_IOK) { + (void)SvIOK_on(dstr); SvIVX(dstr) = SvIVX(sstr); } } - else if (flags & SVf_NOK) { + else if (sflags & SVp_NOK) { SvNVX(dstr) = SvNVX(sstr); - SvNOK_only(dstr); + (void)SvNOK_only(dstr); if (SvIOK(sstr)) { - SvIOK_on(dstr); + (void)SvIOK_on(dstr); SvIVX(dstr) = SvIVX(sstr); } } - else if (flags & SVf_IOK) { - SvIOK_only(dstr); + else if (sflags & SVp_IOK) { + (void)SvIOK_only(dstr); SvIVX(dstr) = SvIVX(sstr); } else { - SvOK_off(dstr); + (void)SvOK_off(dstr); } SvTAINT(dstr); } @@ -1218,20 +1885,29 @@ register SV *sv; register char *ptr; register STRLEN len; { - if (SvREADONLY(sv)) - croak(no_modify); + assert(len >= 0); /* STRLEN is probably unsigned, so this may + elicit a warning, but it won't hurt. */ + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (!ptr) { - SvOK_off(sv); + (void)SvOK_off(sv); return; } - if (!SvUPGRADE(sv, SVt_PV)) + if (SvTYPE(sv) >= SVt_PV) { + if (SvFAKE(sv) && SvTYPE(sv) == SVt_PVGV) + sv_unglob(sv); + } + else if (!sv_upgrade(sv, SVt_PV)) return; SvGROW(sv, len + 1); - if (ptr) - Move(ptr,SvPVX(sv),len,char); + Move(ptr,SvPVX(sv),len,char); SvCUR_set(sv, len); *SvEND(sv) = '\0'; - SvPOK_only(sv); /* validate pointer */ + (void)SvPOK_only(sv); /* validate pointer */ SvTAINT(sv); } @@ -1242,19 +1918,27 @@ register char *ptr; { register STRLEN len; - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (!ptr) { - SvOK_off(sv); + (void)SvOK_off(sv); return; } len = strlen(ptr); - if (!SvUPGRADE(sv, SVt_PV)) + if (SvTYPE(sv) >= SVt_PV) { + if (SvFAKE(sv) && SvTYPE(sv) == SVt_PVGV) + sv_unglob(sv); + } + else if (!sv_upgrade(sv, SVt_PV)) return; SvGROW(sv, len + 1); Move(ptr,SvPVX(sv),len+1,char); SvCUR_set(sv, len); - SvPOK_only(sv); /* validate pointer */ + (void)SvPOK_only(sv); /* validate pointer */ SvTAINT(sv); } @@ -1264,12 +1948,16 @@ register SV *sv; register char *ptr; register STRLEN len; { - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (!SvUPGRADE(sv, SVt_PV)) return; if (!ptr) { - SvOK_off(sv); + (void)SvOK_off(sv); return; } if (SvPVX(sv)) @@ -1279,7 +1967,7 @@ register STRLEN len; SvCUR_set(sv, len); SvLEN_set(sv, len+1); *SvEND(sv) = '\0'; - SvPOK_only(sv); /* validate pointer */ + (void)SvPOK_only(sv); /* validate pointer */ SvTAINT(sv); } @@ -1290,10 +1978,14 @@ register char *ptr; { register STRLEN delta; - if (!ptr || !SvPOK(sv)) + if (!ptr || !SvPOKp(sv)) return; - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (SvTYPE(sv) < SVt_PVIV) sv_upgrade(sv,SVt_PVIV); @@ -1301,7 +1993,7 @@ register char *ptr; SvIVX(sv) = 0; SvFLAGS(sv) |= SVf_OOK; } - SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK); + SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVp_IOK|SVp_NOK); delta = ptr - SvPVX(sv); SvLEN(sv) -= delta; SvCUR(sv) -= delta; @@ -1316,15 +2008,16 @@ register char *ptr; register STRLEN len; { STRLEN tlen; - char *s; - if (SvREADONLY(sv)) - croak(no_modify); - s = SvPV(sv, tlen); + char *junk; + + junk = SvPV_force(sv, tlen); SvGROW(sv, tlen + len + 1); + if (ptr == junk) + ptr = SvPVX(sv); Move(ptr,SvPVX(sv)+tlen,len,char); SvCUR(sv) += len; *SvEND(sv) = '\0'; - SvPOK_only(sv); /* validate pointer */ + (void)SvPOK_only(sv); /* validate pointer */ SvTAINT(sv); } @@ -1348,18 +2041,18 @@ register char *ptr; { register STRLEN len; STRLEN tlen; - char *s; + char *junk; - if (SvREADONLY(sv)) - croak(no_modify); if (!ptr) return; - s = SvPV(sv, tlen); + junk = SvPV_force(sv, tlen); len = strlen(ptr); SvGROW(sv, tlen + len + 1); + if (ptr == junk) + ptr = SvPVX(sv); Move(ptr,SvPVX(sv)+tlen,len+1,char); SvCUR(sv) += len; - SvPOK_only(sv); /* validate pointer */ + (void)SvPOK_only(sv); /* validate pointer */ SvTAINT(sv); } @@ -1374,9 +2067,10 @@ STRLEN len; { register SV *sv; - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; if (len) { sv_upgrade(sv, SVt_PV); SvGROW(sv, len + 1); @@ -1384,43 +2078,64 @@ STRLEN len; return sv; } +/* name is assumed to contain an SV* if (name && namelen == HEf_SVKEY) */ + void sv_magic(sv, obj, how, name, namlen) register SV *sv; SV *obj; -char how; +int how; char *name; I32 namlen; { MAGIC* mg; - if (SvREADONLY(sv)) + if (SvREADONLY(sv) && curcop != &compiling && !strchr("gB", how)) croak(no_modify); - if (SvMAGICAL(sv)) { - if (SvMAGIC(sv) && mg_find(sv, how)) + if (SvMAGICAL(sv) || (how == 't' && SvTYPE(sv) >= SVt_PVMG)) { + if (SvMAGIC(sv) && (mg = mg_find(sv, how))) { + if (how == 't') + mg->mg_len |= 1; return; + } } else { if (!SvUPGRADE(sv, SVt_PVMG)) return; - SvMAGICAL_on(sv); - SvPRIVATE(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK); - SvPRIVATE(sv) |= SvFLAGS(sv) & (SVf_IOK|SVf_NOK|SVf_POK); - SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK); } Newz(702,mg, 1, MAGIC); mg->mg_moremagic = SvMAGIC(sv); SvMAGIC(sv) = mg; - mg->mg_obj = sv_ref(obj); + if (!obj || obj == sv || how == '#') + mg->mg_obj = obj; + else { + mg->mg_obj = SvREFCNT_inc(obj); + mg->mg_flags |= MGf_REFCOUNTED; + } mg->mg_type = how; mg->mg_len = namlen; - if (name && namlen >= 0) - mg->mg_ptr = nsavestr(name, namlen); + if (name) + if (namlen >= 0) + mg->mg_ptr = savepvn(name, namlen); + else if (namlen == HEf_SVKEY) + mg->mg_ptr = (char*)SvREFCNT_inc((SV*)name); + switch (how) { case 0: mg->mg_virtual = &vtbl_sv; break; +#ifdef OVERLOAD + case 'A': + mg->mg_virtual = &vtbl_amagic; + break; + case 'a': + mg->mg_virtual = &vtbl_amagicelem; + break; + case 'c': + mg->mg_virtual = 0; + break; +#endif /* OVERLOAD */ case 'B': mg->mg_virtual = &vtbl_bm; break; @@ -1439,7 +2154,11 @@ I32 namlen; case 'i': mg->mg_virtual = &vtbl_isaelem; break; + case 'k': + mg->mg_virtual = &vtbl_nkeys; + break; case 'L': + SvRMAGICAL_on(sv); mg->mg_virtual = 0; break; case 'l': @@ -1449,6 +2168,7 @@ I32 namlen; mg->mg_virtual = &vtbl_pack; break; case 'p': + case 'q': mg->mg_virtual = &vtbl_packelem; break; case 'S': @@ -1459,6 +2179,7 @@ I32 namlen; break; case 't': mg->mg_virtual = &vtbl_taint; + mg->mg_len = 1; break; case 'U': mg->mg_virtual = &vtbl_uvar; @@ -1475,19 +2196,31 @@ I32 namlen; case '#': mg->mg_virtual = &vtbl_arylen; break; + case '.': + mg->mg_virtual = &vtbl_pos; + break; + case '~': /* Reserved for use by extensions not perl internals. */ + /* Useful for attaching extension internal data to perl vars. */ + /* Note that multiple extensions may clash if magical scalars */ + /* etc holding private data from one are passed to another. */ + SvRMAGICAL_on(sv); + break; default: croak("Don't know how to handle magic of type '%c'", how); } + mg_magical(sv); + if (SvGMAGICAL(sv)) + SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK); } int sv_unmagic(sv, type) SV* sv; -char type; +int type; { MAGIC* mg; MAGIC** mgp; - if (!SvMAGICAL(sv)) + if (SvTYPE(sv) < SVt_PVMG || !SvMAGIC(sv)) return 0; mgp = &SvMAGIC(sv); for (mg = *mgp; mg; mg = *mgp) { @@ -1497,8 +2230,12 @@ char type; if (vtbl && vtbl->svt_free) (*vtbl->svt_free)(sv, mg); if (mg->mg_ptr && mg->mg_type != 'g') - Safefree(mg->mg_ptr); - sv_free(mg->mg_obj); + if (mg->mg_len >= 0) + Safefree(mg->mg_ptr); + else if (mg->mg_len == HEf_SVKEY) + SvREFCNT_dec((SV*)mg->mg_ptr); + if (mg->mg_flags & MGf_REFCOUNTED) + SvREFCNT_dec(mg->mg_obj); Safefree(mg); } else @@ -1506,9 +2243,7 @@ char type; } if (!SvMAGIC(sv)) { SvMAGICAL_off(sv); - SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK); - SvFLAGS(sv) |= SvPRIVATE(sv) & (SVf_IOK|SVf_NOK|SVf_POK); - SvPRIVATE(sv) &= ~(SVf_IOK|SVf_NOK|SVf_POK); + SvFLAGS(sv) |= (SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; } return 0; @@ -1528,16 +2263,13 @@ STRLEN littlelen; register char *bigend; register I32 i; - if (SvREADONLY(bigstr)) - croak(no_modify); - SvPOK_only(bigstr); + if (!bigstr) + croak("Can't modify non-existent substring"); + SvPV_force(bigstr, na); i = littlelen - len; if (i > 0) { /* string might grow */ - if (!SvUPGRADE(bigstr, SVt_PV)) - return; - SvGROW(bigstr, SvCUR(bigstr) + i + 1); - big = SvPVX(bigstr); + big = SvGROW(bigstr, SvCUR(bigstr) + i + 1); mid = big + offset + len; midend = bigend = big + SvCUR(bigstr); bigend += i; @@ -1606,14 +2338,21 @@ register SV *sv; register SV *nsv; { U32 refcnt = SvREFCNT(sv); - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (SvREFCNT(nsv) != 1) warn("Reference miscount in sv_replace()"); if (SvMAGICAL(sv)) { - SvUPGRADE(nsv, SVt_PVMG); + if (SvMAGICAL(nsv)) + mg_free(nsv); + else + sv_upgrade(nsv, SVt_PVMG); SvMAGIC(nsv) = SvMAGIC(sv); - SvMAGICAL_on(nsv); + SvFLAGS(nsv) |= SvMAGICAL(sv); SvMAGICAL_off(sv); SvMAGIC(sv) = 0; } @@ -1621,6 +2360,7 @@ register SV *nsv; sv_clear(sv); StructCopy(nsv,sv,SV); SvREFCNT(sv) = refcnt; + SvFLAGS(nsv) |= SVTYPEMASK; /* Mark as freed */ del_SV(nsv); } @@ -1631,100 +2371,113 @@ register SV *sv; assert(sv); assert(SvREFCNT(sv) == 0); - if (SvSTORAGE(sv) == 'O') { + if (SvOBJECT(sv)) { dSP; - BINOP myop; /* fake syntax tree node */ GV* destructor; - SvSTORAGE(sv) = 0; /* Curse the object. */ - - ENTER; - SAVETMPS; - SAVESPTR(curcop); - SAVESPTR(op); - curcop = &compiling; - curstash = SvSTASH(sv); - destructor = gv_fetchpv("DESTROY", FALSE); - - if (destructor && GvCV(destructor)) { - SV* ref = sv_mortalcopy(&sv_undef); - sv_upgrade(ref, SVt_REF); - SvANY(ref) = (void*)sv_ref(sv); - - op = (OP*)&myop; - Zero(op, 1, OP); - myop.op_last = (OP*)&myop; - myop.op_flags = OPf_STACKED; - myop.op_next = Nullop; - - EXTEND(SP, 2); - PUSHs((SV*)destructor); - pp_pushmark(); - PUSHs(ref); - PUTBACK; - op = pp_entersubr(); - if (op) - run(); - stack_sp--; - SvREFCNT(sv) = 0; - SvTYPE(ref) = SVt_NULL; - free_tmps(); - } - LEAVE; + if (defstash) { /* Still have a symbol table? */ + destructor = gv_fetchmethod(SvSTASH(sv), "DESTROY"); + + ENTER; + SAVEFREESV(SvSTASH(sv)); + if (destructor && GvCV(destructor)) { + SV ref; + + Zero(&ref, 1, SV); + sv_upgrade(&ref, SVt_RV); + SvRV(&ref) = SvREFCNT_inc(sv); + SvROK_on(&ref); + + EXTEND(SP, 2); + PUSHMARK(SP); + PUSHs(&ref); + PUTBACK; + perl_call_sv((SV*)destructor, G_DISCARD|G_EVAL|G_KEEPERR); + del_XRV(SvANY(&ref)); + SvREFCNT(sv)--; + } + LEAVE; + } + else + SvREFCNT_dec(SvSTASH(sv)); + if (SvOBJECT(sv)) { + SvOBJECT_off(sv); /* Curse the object. */ + if (SvTYPE(sv) != SVt_PVIO) + --sv_objcount; /* XXX Might want something more general */ + } + if (SvREFCNT(sv)) { + SV *ret; + if ( perldb + && (ret = perl_get_sv("DB::ret", FALSE)) + && SvROK(ret) && SvRV(ret) == sv && SvREFCNT(sv) == 1) { + /* Debugger is prone to dangling references. */ + SvRV(ret) = 0; + SvROK_off(ret); + SvREFCNT(sv) = 0; + } else { + croak("panic: dangling references in DESTROY"); + } + } } + if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv)) + mg_free(sv); switch (SvTYPE(sv)) { - case SVt_PVFM: - goto freemagic; + case SVt_PVIO: + io_close((IO*)sv); + Safefree(IoTOP_NAME(sv)); + Safefree(IoFMT_NAME(sv)); + Safefree(IoBOTTOM_NAME(sv)); + /* FALL THROUGH */ case SVt_PVBM: - goto freemagic; - case SVt_PVGV: - gp_free(sv); - goto freemagic; + goto freescalar; case SVt_PVCV: - cv_clear((CV*)sv); - goto freemagic; + case SVt_PVFM: + cv_undef((CV*)sv); + goto freescalar; case SVt_PVHV: - hv_clear((HV*)sv); - goto freemagic; + hv_undef((HV*)sv); + break; case SVt_PVAV: - av_clear((AV*)sv); - goto freemagic; + av_undef((AV*)sv); + break; + case SVt_PVGV: + gp_free((GV*)sv); + Safefree(GvNAME(sv)); + /* FALL THROUGH */ case SVt_PVLV: - goto freemagic; case SVt_PVMG: - freemagic: - if (SvMAGICAL(sv)) - mg_free(sv); case SVt_PVNV: case SVt_PVIV: - SvOOK_off(sv); + freescalar: + (void)SvOOK_off(sv); /* FALL THROUGH */ case SVt_PV: - if (SvPVX(sv)) + case SVt_RV: + if (SvROK(sv)) + SvREFCNT_dec(SvRV(sv)); + else if (SvPVX(sv) && SvLEN(sv)) Safefree(SvPVX(sv)); break; +/* case SVt_NV: - break; case SVt_IV: - break; - case SVt_REF: - sv_free((SV*)SvANY(sv)); - break; case SVt_NULL: break; +*/ } switch (SvTYPE(sv)) { case SVt_NULL: break; - case SVt_REF: - break; case SVt_IV: del_XIV(SvANY(sv)); break; case SVt_NV: del_XNV(SvANY(sv)); break; + case SVt_RV: + del_XRV(SvANY(sv)); + break; case SVt_PV: del_XPV(SvANY(sv)); break; @@ -1758,12 +2511,16 @@ register SV *sv; case SVt_PVFM: del_XPVFM(SvANY(sv)); break; + case SVt_PVIO: + del_XPVIO(SvANY(sv)); + break; } - DEB(SvTYPE(sv) = 0xff;) + SvFLAGS(sv) &= SVf_BREAK; + SvFLAGS(sv) |= SVTYPEMASK; } SV * -sv_ref(sv) +sv_newref(sv) SV* sv; { if (sv) @@ -1782,19 +2539,22 @@ SV *sv; return; } if (SvREFCNT(sv) == 0) { + if (SvFLAGS(sv) & SVf_BREAK) + return; + if (in_clean_all) /* All is fair */ + return; warn("Attempt to free unreferenced scalar"); return; } + if (--SvREFCNT(sv) > 0) + return; #ifdef DEBUGGING if (SvTEMP(sv)) { warn("Attempt to free temp prematurely"); return; } #endif - if (--SvREFCNT(sv) > 0) - return; sv_clear(sv); - DEB(SvTYPE(sv) = 0xff;) del_SV(sv); } @@ -1802,13 +2562,16 @@ STRLEN sv_len(sv) register SV *sv; { - char *s; + char *junk; STRLEN len; if (!sv) return 0; - s = SvPV(sv, len); + if (SvGMAGICAL(sv)) + len = mg_len(sv); + else + junk = SvPV(sv, len); return len; } @@ -1837,7 +2600,7 @@ register SV *str2; if (cur1 != cur2) return 0; - return !bcmp(pv1, pv2, cur1); + return !memcmp(pv1, pv2, cur1); } I32 @@ -1851,71 +2614,173 @@ register SV *str2; char *pv2; STRLEN cur2; + if (lc_collate_active) { /* NOTE: this is the LC_COLLATE branch */ + if (!str1) { pv1 = ""; cur1 = 0; - } - else + } else { pv1 = SvPV(str1, cur1); + { + STRLEN cur1x; + char * pv1x = mem_collxfrm(pv1, cur1, &cur1x); + + pv1 = pv1x; + cur1 = cur1x; + } + } + if (!str2) { pv2 = ""; cur2 = 0; - } - else + } else { pv2 = SvPV(str2, cur2); - if (!cur1) + { + STRLEN cur2x; + char * pv2x = mem_collxfrm(pv2, cur2, &cur2x); + + pv2 = pv2x; + cur2 = cur2x; + } + } + + if (!cur1) { + Safefree(pv2); return cur2 ? -1 : 0; - if (!cur2) + } + + if (!cur2) { + Safefree(pv1); return 1; + } - if (cur1 < cur2) { - /*SUPPRESS 560*/ - if (retval = memcmp(pv1, pv2, cur1)) - return retval < 0 ? -1 : 1; - else - return -1; - } - /*SUPPRESS 560*/ - else if (retval = memcmp(pv1, pv2, cur2)) - return retval < 0 ? -1 : 1; - else if (cur1 == cur2) + retval = memcmp((void*)pv1, (void*)pv2, cur1 < cur2 ? cur1 : cur2); + + Safefree(pv1); + Safefree(pv2); + + if (retval) + return retval < 0 ? -1 : 1; + + if (cur1 == cur2) return 0; else + return cur1 < cur2 ? -1 : 1; + + } else { /* NOTE: this is the non-LC_COLLATE branch */ + + if (!str1) { + pv1 = ""; + cur1 = 0; + } else + pv1 = SvPV(str1, cur1); + + if (!str2) { + pv2 = ""; + cur2 = 0; + } else + pv2 = SvPV(str2, cur2); + + if (!cur1) + return cur2 ? -1 : 0; + + if (!cur2) return 1; + + retval = memcmp((void*)pv1, (void*)pv2, cur1 < cur2 ? cur1 : cur2); + + if (retval) + return retval < 0 ? -1 : 1; + + if (cur1 == cur2) + return 0; + else + return cur1 < cur2 ? -1 : 1; + } } char * sv_gets(sv,fp,append) register SV *sv; -register FILE *fp; +register PerlIO *fp; I32 append; { - register char *bp; /* we're going to steal some values */ - register I32 cnt; /* from the stdio struct and put EVERYTHING */ - register STDCHAR *ptr; /* in the innermost loop into registers */ - register I32 newline = rschar;/* (assuming >= 6 registers) */ + char *rsptr; + STRLEN rslen; + register STDCHAR rslast; + register STDCHAR *bp; + register I32 cnt; I32 i; - STRLEN bpx; - I32 shortbuffered; - if (SvREADONLY(sv)) - croak(no_modify); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) + sv_unref(sv); + } if (!SvUPGRADE(sv, SVt_PV)) - return; - if (rspara) { /* have to do this both before and after */ + return 0; + + if (RsSNARF(rs)) { + rsptr = NULL; + rslen = 0; + } + else if (RsPARA(rs)) { + rsptr = "\n\n"; + rslen = 2; + } + else + rsptr = SvPV(rs, rslen); + rslast = rslen ? rsptr[rslen - 1] : '\0'; + + if (RsPARA(rs)) { /* have to do this both before and after */ do { /* to make sure file boundaries work right */ - i = getc(fp); + if (PerlIO_eof(fp)) + return 0; + i = PerlIO_getc(fp); if (i != '\n') { - ungetc(i,fp); + if (i == -1) + return 0; + PerlIO_ungetc(fp,i); break; } } while (i != EOF); } -#ifdef STDSTDIO /* Here is some breathtakingly efficient cheating */ - cnt = fp->_cnt; /* get count into register */ - SvPOK_only(sv); /* validate pointer */ + + /* See if we know enough about I/O mechanism to cheat it ! */ + + /* This used to be #ifdef test - it is made run-time test for ease + of abstracting out stdio interface. One call should be cheap + enough here - and may even be a macro allowing compile + time optimization. + */ + + if (PerlIO_fast_gets(fp)) { + + /* + * We're going to steal some values from the stdio struct + * and put EVERYTHING in the innermost loop into registers. + */ + register STDCHAR *ptr; + STRLEN bpx; + I32 shortbuffered; + +#if defined(VMS) && defined(PERLIO_IS_STDIO) + /* An ungetc()d char is handled separately from the regular + * buffer, so we getc() it back out and stuff it in the buffer. + */ + i = PerlIO_getc(fp); + if (i == EOF) return 0; + *(--((*fp)->_ptr)) = (unsigned char) i; + (*fp)->_cnt++; +#endif + + /* Here is some breathtakingly efficient cheating */ + + cnt = PerlIO_get_cnt(fp); /* get count into register */ + (void)SvPOK_only(sv); /* validate pointer */ if (SvLEN(sv) - append <= cnt + 1) { /* make sure we have the room */ if (cnt > 80 && SvLEN(sv) > append) { shortbuffered = cnt - SvLEN(sv) + append + 1; @@ -1928,105 +2793,145 @@ I32 append; } else shortbuffered = 0; - bp = SvPVX(sv) + append; /* move these two too to registers */ - ptr = fp->_ptr; + bp = (STDCHAR*)SvPVX(sv) + append; /* move these two too to registers */ + ptr = (STDCHAR*)PerlIO_get_ptr(fp); + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: entering, ptr=%d, cnt=%d\n",ptr,cnt)); + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: entering: FILE * thinks ptr=%d, cnt=%d, base=%d\n", + PerlIO_get_ptr(fp), PerlIO_get_cnt(fp), PerlIO_get_base(fp))); for (;;) { screamer: if (cnt > 0) { - while (--cnt >= 0) { /* this */ /* eat */ - if ((*bp++ = *ptr++) == newline) /* really */ /* dust */ - goto thats_all_folks; /* screams */ /* sed :-) */ + if (rslen) { + while (cnt > 0) { /* this | eat */ + cnt--; + if ((*bp++ = *ptr++) == rslast) /* really | dust */ + goto thats_all_folks; /* screams | sed :-) */ + } + } + else { + memcpy((char*)bp, (char*)ptr, cnt); /* this | eat */ + bp += cnt; /* screams | dust */ + ptr += cnt; /* louder | sed :-) */ + cnt = 0; } } - if (shortbuffered) { /* oh well, must extend */ + if (shortbuffered) { /* oh well, must extend */ cnt = shortbuffered; shortbuffered = 0; - bpx = bp - SvPVX(sv); /* prepare for possible relocation */ + bpx = bp - (STDCHAR*)SvPVX(sv); /* box up before relocation */ SvCUR_set(sv, bpx); SvGROW(sv, SvLEN(sv) + append + cnt + 2); - bp = SvPVX(sv) + bpx; /* reconstitute our pointer */ + bp = (STDCHAR*)SvPVX(sv) + bpx; /* unbox after relocation */ continue; } - fp->_cnt = cnt; /* deregisterize cnt and ptr */ - fp->_ptr = ptr; - i = _filbuf(fp); /* get more characters */ - cnt = fp->_cnt; - ptr = fp->_ptr; /* reregisterize cnt and ptr */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: going to getc, ptr=%d, cnt=%d\n",ptr,cnt)); + PerlIO_set_ptrcnt(fp, ptr, cnt); /* deregisterize cnt and ptr */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: pre: FILE * thinks ptr=%d, cnt=%d, base=%d\n", + PerlIO_get_ptr(fp), PerlIO_get_cnt(fp), PerlIO_get_base(fp))); + /* This used to call 'filbuf' in stdio form, but as that behaves like + getc when cnt <= 0 we use PerlIO_getc here to avoid another + abstraction. This may also avoid issues with different named + 'filbuf' equivalents, though Configure tries to handle them now + anyway. + */ + i = PerlIO_getc(fp); /* get more characters */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: post: FILE * thinks ptr=%d, cnt=%d, base=%d\n", + PerlIO_get_ptr(fp), PerlIO_get_cnt(fp), PerlIO_get_base(fp))); + cnt = PerlIO_get_cnt(fp); + ptr = (STDCHAR*)PerlIO_get_ptr(fp); /* reregisterize cnt and ptr */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: after getc, ptr=%d, cnt=%d\n",ptr,cnt)); + + if (i == EOF) /* all done for ever? */ + goto thats_really_all_folks; - bpx = bp - SvPVX(sv); /* prepare for possible relocation */ + bpx = bp - (STDCHAR*)SvPVX(sv); /* box up before relocation */ SvCUR_set(sv, bpx); SvGROW(sv, bpx + cnt + 2); - bp = SvPVX(sv) + bpx; /* reconstitute our pointer */ + bp = (STDCHAR*)SvPVX(sv) + bpx; /* unbox after relocation */ + + *bp++ = i; /* store character from PerlIO_getc */ - if (i == newline) { /* all done for now? */ - *bp++ = i; + if (rslen && (STDCHAR)i == rslast) /* all done for now? */ goto thats_all_folks; - } - else if (i == EOF) /* all done for ever? */ - goto thats_really_all_folks; - *bp++ = i; /* now go back to screaming loop */ } thats_all_folks: - if (rslen > 1 && (bp - SvPVX(sv) < rslen || bcmp(bp - rslen, rs, rslen))) - goto screamer; /* go back to the fray */ + if ((rslen > 1 && (bp - (STDCHAR*)SvPVX(sv) < rslen)) || + memcmp((char*)bp - rslen, rsptr, rslen)) + goto screamer; /* go back to the fray */ thats_really_all_folks: if (shortbuffered) cnt += shortbuffered; - fp->_cnt = cnt; /* put these back or we're in trouble */ - fp->_ptr = ptr; + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: quitting, ptr=%d, cnt=%d\n",ptr,cnt)); + PerlIO_set_ptrcnt(fp, ptr, cnt); /* put these back or we're in trouble */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: end: FILE * thinks ptr=%d, cnt=%d, base=%d\n", + PerlIO_get_ptr(fp), PerlIO_get_cnt(fp), PerlIO_get_base(fp))); *bp = '\0'; - SvCUR_set(sv, bp - SvPVX(sv)); /* set length */ - -#else /* !STDSTDIO */ /* The big, slow, and stupid way */ - + SvCUR_set(sv, bp - (STDCHAR*)SvPVX(sv)); /* set length */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: done, len=%d, string=|%.*s|\n", + SvCUR(sv),SvCUR(sv),SvPVX(sv))); + } + else { - char buf[8192]; - register char * bpe = buf + sizeof(buf) - 3; - -screamer: - bp = buf; - while ((i = getc(fp)) != EOF && (*bp++ = i) != newline && bp < bpe) ; + /*The big, slow, and stupid way */ + STDCHAR buf[8192]; + +screamer2: + if (rslen) { + register STDCHAR *bpe = buf + sizeof(buf); + bp = buf; + while ((i = PerlIO_getc(fp)) != EOF && (*bp++ = i) != rslast && bp < bpe) + ; /* keep reading */ + cnt = bp - buf; + } + else { + cnt = PerlIO_read(fp,(char*)buf, sizeof(buf)); + /* Accomodate broken VAXC compiler, which applies U8 cast to + * both args of ?: operator, causing EOF to change into 255 + */ + if (cnt) { i = (U8)buf[cnt - 1]; } else { i = EOF; } + } if (append) - sv_catpvn(sv, buf, bp - buf); + sv_catpvn(sv, (char *) buf, cnt); else - sv_setpvn(sv, buf, bp - buf); - if (i != EOF /* joy */ - && - (i != newline - || - (rslen > 1 - && - (SvCUR(sv) < rslen - || - bcmp(SvPVX(sv) + SvCUR(sv) - rslen, rs, rslen) - ) - ) - ) - ) + sv_setpvn(sv, (char *) buf, cnt); + + if (i != EOF && /* joy */ + (!rslen || + SvCUR(sv) < rslen || + memcmp(SvPVX(sv) + SvCUR(sv) - rslen, rsptr, rslen))) { append = -1; - goto screamer; + goto screamer2; } } -#endif /* STDSTDIO */ - - if (rspara) { - while (i != EOF) { - i = getc(fp); + if (RsPARA(rs)) { /* have to do this both before and after */ + while (i != EOF) { /* to make sure file boundaries work right */ + i = PerlIO_getc(fp); if (i != '\n') { - ungetc(i,fp); + PerlIO_ungetc(fp,i); break; } } } - return SvCUR(sv) - append ? SvPVX(sv) : Nullch; + + return (SvCUR(sv) - append) ? SvPVX(sv) : Nullch; } + void sv_inc(sv) register SV *sv; @@ -2036,29 +2941,34 @@ register SV *sv; if (!sv) return; - if (SvREADONLY(sv)) - croak(no_modify); - if (SvMAGICAL(sv)) { - mg_get(sv); - flags = SvPRIVATE(sv); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) { +#ifdef OVERLOAD + if (SvAMAGIC(sv) && AMG_CALLun(sv,inc)) return; +#endif /* OVERLOAD */ + sv_unref(sv); + } } - else - flags = SvFLAGS(sv); - if (flags & SVf_IOK) { + if (SvGMAGICAL(sv)) + mg_get(sv); + flags = SvFLAGS(sv); + if (flags & SVp_IOK) { + (void)SvIOK_only(sv); ++SvIVX(sv); - SvIOK_only(sv); return; } - if (flags & SVf_NOK) { + if (flags & SVp_NOK) { SvNVX(sv) += 1.0; - SvNOK_only(sv); + (void)SvNOK_only(sv); return; } - if (!(flags & SVf_POK) || !*SvPVX(sv)) { - if (!SvUPGRADE(sv, SVt_NV)) - return; + if (!(flags & SVp_POK) || !*SvPVX(sv)) { + if ((flags & SVTYPEMASK) < SVt_PVNV) + sv_upgrade(sv, SVt_NV); SvNVX(sv) = 1.0; - SvNOK_only(sv); + (void)SvNOK_only(sv); return; } d = SvPVX(sv); @@ -2101,29 +3011,34 @@ register SV *sv; if (!sv) return; - if (SvREADONLY(sv)) - croak(no_modify); - if (SvMAGICAL(sv)) { - mg_get(sv); - flags = SvPRIVATE(sv); + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + if (SvROK(sv)) { +#ifdef OVERLOAD + if (SvAMAGIC(sv) && AMG_CALLun(sv,dec)) return; +#endif /* OVERLOAD */ + sv_unref(sv); + } } - else - flags = SvFLAGS(sv); - if (flags & SVf_IOK) { + if (SvGMAGICAL(sv)) + mg_get(sv); + flags = SvFLAGS(sv); + if (flags & SVp_IOK) { + (void)SvIOK_only(sv); --SvIVX(sv); - SvIOK_only(sv); return; } - if (flags & SVf_NOK) { + if (flags & SVp_NOK) { SvNVX(sv) -= 1.0; - SvNOK_only(sv); + (void)SvNOK_only(sv); return; } - if (!(flags & SVf_POK)) { - if (!SvUPGRADE(sv, SVt_NV)) - return; + if (!(flags & SVp_POK)) { + if ((flags & SVTYPEMASK) < SVt_PVNV) + sv_upgrade(sv, SVt_NV); SvNVX(sv) = -1.0; - SvNOK_only(sv); + (void)SvNOK_only(sv); return; } sv_setnv(sv,atof(SvPVX(sv)) - 1.0); @@ -2134,28 +3049,43 @@ register SV *sv; * hopefully we won't free it until it has been assigned to a * permanent location. */ +static void +sv_mortalgrow() +{ + tmps_max += 128; + Renew(tmps_stack, tmps_max, SV*); +} + SV * sv_mortalcopy(oldstr) SV *oldstr; { register SV *sv; - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; sv_setsv(sv,oldstr); - if (++tmps_ix > tmps_max) { - tmps_max = tmps_ix; - if (!(tmps_max & 127)) { - if (tmps_max) - Renew(tmps_stack, tmps_max + 128, SV*); - else - New(702,tmps_stack, 128, SV*); - } - } + if (++tmps_ix >= tmps_max) + sv_mortalgrow(); + tmps_stack[tmps_ix] = sv; + SvTEMP_on(sv); + return sv; +} + +SV * +sv_newmortal() +{ + register SV *sv; + + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = SVs_TEMP; + if (++tmps_ix >= tmps_max) + sv_mortalgrow(); tmps_stack[tmps_ix] = sv; - if (SvPOK(sv)) - SvTEMP_on(sv); return sv; } @@ -2167,20 +3097,12 @@ register SV *sv; { if (!sv) return sv; - if (SvREADONLY(sv)) + if (SvREADONLY(sv) && curcop != &compiling) croak(no_modify); - if (++tmps_ix > tmps_max) { - tmps_max = tmps_ix; - if (!(tmps_max & 127)) { - if (tmps_max) - Renew(tmps_stack, tmps_max + 128, SV*); - else - New(704,tmps_stack, 128, SV*); - } - } + if (++tmps_ix >= tmps_max) + sv_mortalgrow(); tmps_stack[tmps_ix] = sv; - if (SvPOK(sv)) - SvTEMP_on(sv); + SvTEMP_on(sv); return sv; } @@ -2191,9 +3113,10 @@ STRLEN len; { register SV *sv; - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; if (!len) len = strlen(s); sv_setpvn(sv,s,len); @@ -2206,26 +3129,45 @@ double n; { register SV *sv; - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; sv_setnv(sv,n); return sv; } SV * newSViv(i) -I32 i; +IV i; { register SV *sv; - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; sv_setiv(sv,i); return sv; } +SV * +newRV(ref) +SV *ref; +{ + register SV *sv; + + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; + sv_upgrade(sv, SVt_RV); + SvTEMP_off(ref); + SvRV(sv) = SvREFCNT_inc(ref); + SvROK_on(sv); + return sv; +} + /* make an exact duplicate of old */ SV * @@ -2236,13 +3178,14 @@ register SV *old; if (!old) return Nullsv; - if (SvTYPE(old) == 0xff) { + if (SvTYPE(old) == SVTYPEMASK) { warn("semi-panic: attempt to dup freed string"); return Nullsv; } - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; if (SvTEMP(old)) { SvTEMP_off(old); sv_setsv(sv,old); @@ -2288,15 +3231,15 @@ HV *stash; for ( ; i <= max; i++) { todo[i] = 1; } - for (i = 0; i <= HvMAX(stash); i++) { + for (i = 0; i <= (I32) HvMAX(stash); i++) { for (entry = HvARRAY(stash)[i]; entry; - entry = entry->hent_next) { - if (!todo[(U8)*entry->hent_key]) + entry = HeNEXT(entry)) { + if (!todo[(U8)*HeKEY(entry)]) continue; - gv = (GV*)entry->hent_val; + gv = (GV*)HeVAL(entry); sv = GvSV(gv); - SvOK_off(sv); + (void)SvOK_off(sv); if (SvTYPE(sv) >= SVt_PV) { SvCUR_set(sv, 0); SvTAINT(sv); @@ -2307,9 +3250,13 @@ HV *stash; av_clear(GvAV(gv)); } if (GvHV(gv)) { + if (HvNAME(GvHV(gv))) + continue; hv_clear(GvHV(gv)); +#ifndef VMS /* VMS has no environ array */ if (gv == envgv) environ[0] = Nullch; +#endif } } } @@ -2329,13 +3276,6 @@ I32 lref; if (!sv) return *gvp = Nullgv, Nullcv; switch (SvTYPE(sv)) { - case SVt_REF: - cv = (CV*)SvANY(sv); - if (SvTYPE(cv) != SVt_PVCV) - croak("Not a subroutine reference"); - *gvp = Nullgv; - *st = CvSTASH(cv); - return cv; case SVt_PVCV: *st = CvSTASH(sv); *gvp = Nullgv; @@ -2344,15 +3284,45 @@ I32 lref; case SVt_PVAV: *gvp = Nullgv; return Nullcv; + case SVt_PVGV: + gv = (GV*)sv; + *gvp = gv; + *st = GvESTASH(gv); + goto fix_gv; + default: + if (SvGMAGICAL(sv)) + mg_get(sv); + if (SvROK(sv)) { + cv = (CV*)SvRV(sv); + if (SvTYPE(cv) != SVt_PVCV) + croak("Not a subroutine reference"); + *gvp = Nullgv; + *st = CvSTASH(cv); + return cv; + } if (isGV(sv)) gv = (GV*)sv; else - gv = gv_fetchpv(SvPV(sv, na), lref); + gv = gv_fetchpv(SvPV(sv, na), lref, SVt_PVCV); *gvp = gv; if (!gv) return Nullcv; *st = GvESTASH(gv); + fix_gv: + if (lref && !GvCV(gv)) { + SV *tmpsv; + ENTER; + tmpsv = NEWSV(704,0); + gv_efullname3(tmpsv, gv, Nullch); + newSUB(start_subparse(), + newSVOP(OP_CONST, 0, tmpsv), + Nullop, + Nullop); + LEAVE; + if (!GvCV(gv)) + croak("Unable to create sub named \"%s\"", SvPV(sv,na)); + } return GvCV(gv); } } @@ -2362,7 +3332,9 @@ I32 SvTRUE(sv) register SV *sv; { - if (SvMAGICAL(sv)) + if (!sv) + return 0; + if (SvGMAGICAL(sv)) mg_get(sv); if (SvPOK(sv)) { register XPV* Xpv; @@ -2387,6 +3359,17 @@ register SV *sv; } #endif /* SvTRUE */ +#ifndef SvIV +IV SvIV(Sv) +register SV *Sv; +{ + if (SvIOK(Sv)) + return SvIVX(Sv); + return sv_2iv(Sv); +} +#endif /* SvIV */ + + #ifndef SvNV double SvNV(Sv) register SV *Sv; @@ -2405,50 +3388,527 @@ sv_pvn(sv, lp) SV *sv; STRLEN *lp; { - if (SvPOK(sv)) - return SvPVX(sv) + if (SvPOK(sv)) { + *lp = SvCUR(sv); + return SvPVX(sv); + } return sv_2pv(sv, lp); } #endif +char * +sv_pvn_force(sv, lp) +SV *sv; +STRLEN *lp; +{ + char *s; + + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); + + if (SvPOK(sv)) { + *lp = SvCUR(sv); + } + else { + if (SvTYPE(sv) > SVt_PVLV && SvTYPE(sv) != SVt_PVFM) { + if (SvFAKE(sv) && SvTYPE(sv) == SVt_PVGV) { + sv_unglob(sv); + s = SvPVX(sv); + *lp = SvCUR(sv); + } + else + croak("Can't coerce %s to string in %s", sv_reftype(sv,0), + op_name[op->op_type]); + } + else + s = sv_2pv(sv, lp); + if (s != SvPVX(sv)) { /* Almost, but not quite, sv_setpvn() */ + STRLEN len = *lp; + + if (SvROK(sv)) + sv_unref(sv); + (void)SvUPGRADE(sv, SVt_PV); /* Never FALSE */ + SvGROW(sv, len + 1); + Move(s,SvPVX(sv),len,char); + SvCUR_set(sv, len); + *SvEND(sv) = '\0'; + } + if (!SvPOK(sv)) { + SvPOK_on(sv); /* validate pointer */ + SvTAINT(sv); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2pv(%s)\n", + (unsigned long)sv,SvPVX(sv))); + } + } + return SvPVX(sv); +} + +char * +sv_reftype(sv, ob) +SV* sv; +int ob; +{ + if (ob && SvOBJECT(sv)) + return HvNAME(SvSTASH(sv)); + else { + switch (SvTYPE(sv)) { + case SVt_NULL: + case SVt_IV: + case SVt_NV: + case SVt_RV: + case SVt_PV: + case SVt_PVIV: + case SVt_PVNV: + case SVt_PVMG: + case SVt_PVBM: + if (SvROK(sv)) + return "REF"; + else + return "SCALAR"; + case SVt_PVLV: return "LVALUE"; + case SVt_PVAV: return "ARRAY"; + case SVt_PVHV: return "HASH"; + case SVt_PVCV: return "CODE"; + case SVt_PVGV: return "GLOB"; + case SVt_PVFM: return "FORMLINE"; + default: return "UNKNOWN"; + } + } +} + +int +sv_isobject(sv) +SV *sv; +{ + if (!SvROK(sv)) + return 0; + sv = (SV*)SvRV(sv); + if (!SvOBJECT(sv)) + return 0; + return 1; +} + int sv_isa(sv, name) SV *sv; char *name; { - if (SvTYPE(sv) != SVt_REF) + if (!SvROK(sv)) return 0; - sv = (SV*)SvANY(sv); - if (SvSTORAGE(sv) != 'O') + sv = (SV*)SvRV(sv); + if (!SvOBJECT(sv)) return 0; return strEQ(HvNAME(SvSTASH(sv)), name); } SV* -sv_setptrobj(rv, ptr, name) +newSVrv(rv, classname) SV *rv; -void *ptr; -char *name; +char *classname; { - HV *stash; SV *sv; - if (!ptr) - return rv; + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 0; + SvFLAGS(sv) = 0; + sv_upgrade(rv, SVt_RV); + SvRV(rv) = SvREFCNT_inc(sv); + SvROK_on(rv); + + if (classname) { + HV* stash = gv_stashpv(classname, TRUE); + (void)sv_bless(rv, stash); + } + return sv; +} - new_SV(); - Zero(sv, 1, SV); - SvREFCNT(sv)++; - sv_setnv(sv, (double)(unsigned long)ptr); - sv_upgrade(rv, SVt_REF); - SvANY(rv) = (void*)sv_ref(sv); +SV* +sv_setref_pv(rv, classname, pv) +SV *rv; +char *classname; +void* pv; +{ + if (!pv) + sv_setsv(rv, &sv_undef); + else + sv_setiv(newSVrv(rv,classname), (IV)pv); + return rv; +} + +SV* +sv_setref_iv(rv, classname, iv) +SV *rv; +char *classname; +IV iv; +{ + sv_setiv(newSVrv(rv,classname), iv); + return rv; +} - stash = fetch_stash(newSVpv(name,0), TRUE); - SvSTORAGE(sv) = 'O'; - SvUPGRADE(sv, SVt_PVMG); - SvSTASH(sv) = stash; +SV* +sv_setref_nv(rv, classname, nv) +SV *rv; +char *classname; +double nv; +{ + sv_setnv(newSVrv(rv,classname), nv); + return rv; +} +SV* +sv_setref_pvn(rv, classname, pv, n) +SV *rv; +char *classname; +char* pv; +I32 n; +{ + sv_setpvn(newSVrv(rv,classname), pv, n); return rv; } +SV* +sv_bless(sv,stash) +SV* sv; +HV* stash; +{ + SV *ref; + if (!SvROK(sv)) + croak("Can't bless non-reference value"); + ref = SvRV(sv); + if (SvFLAGS(ref) & (SVs_OBJECT|SVf_READONLY)) { + if (SvREADONLY(ref)) + croak(no_modify); + if (SvOBJECT(ref) && SvTYPE(ref) != SVt_PVIO) + --sv_objcount; + } + SvOBJECT_on(ref); + ++sv_objcount; + (void)SvUPGRADE(ref, SVt_PVMG); + SvSTASH(ref) = (HV*)SvREFCNT_inc(stash); + +#ifdef OVERLOAD + SvAMAGIC_off(sv); + if (Gv_AMG(stash)) { + SvAMAGIC_on(sv); + } +#endif /* OVERLOAD */ + + return sv; +} + +static void +sv_unglob(sv) +SV* sv; +{ + assert(SvTYPE(sv) == SVt_PVGV); + SvFAKE_off(sv); + if (GvGP(sv)) + gp_free((GV*)sv); + sv_unmagic(sv, '*'); + Safefree(GvNAME(sv)); + GvMULTI_off(sv); + SvFLAGS(sv) &= ~SVTYPEMASK; + SvFLAGS(sv) |= SVt_PVMG; +} + +void +sv_unref(sv) +SV* sv; +{ + SV* rv = SvRV(sv); + + SvRV(sv) = 0; + SvROK_off(sv); + if (SvREFCNT(rv) != 1 || SvREADONLY(rv)) + SvREFCNT_dec(rv); + else + sv_2mortal(rv); /* Schedule for freeing later */ +} + +#ifdef DEBUGGING +void +sv_dump(sv) +SV* sv; +{ + char tmpbuf[1024]; + char *d = tmpbuf; + U32 flags; + U32 type; + + if (!sv) { + PerlIO_printf(Perl_debug_log, "SV = 0\n"); + return; + } + + flags = SvFLAGS(sv); + type = SvTYPE(sv); + + sprintf(d, "(0x%lx)\n REFCNT = %ld\n FLAGS = (", + (unsigned long)SvANY(sv), (long)SvREFCNT(sv)); + d += strlen(d); + if (flags & SVs_PADBUSY) strcat(d, "PADBUSY,"); + if (flags & SVs_PADTMP) strcat(d, "PADTMP,"); + if (flags & SVs_PADMY) strcat(d, "PADMY,"); + if (flags & SVs_TEMP) strcat(d, "TEMP,"); + if (flags & SVs_OBJECT) strcat(d, "OBJECT,"); + if (flags & SVs_GMG) strcat(d, "GMG,"); + if (flags & SVs_SMG) strcat(d, "SMG,"); + if (flags & SVs_RMG) strcat(d, "RMG,"); + d += strlen(d); + + if (flags & SVf_IOK) strcat(d, "IOK,"); + if (flags & SVf_NOK) strcat(d, "NOK,"); + if (flags & SVf_POK) strcat(d, "POK,"); + if (flags & SVf_ROK) strcat(d, "ROK,"); + if (flags & SVf_OOK) strcat(d, "OOK,"); + if (flags & SVf_FAKE) strcat(d, "FAKE,"); + if (flags & SVf_READONLY) strcat(d, "READONLY,"); + d += strlen(d); + +#ifdef OVERLOAD + if (flags & SVf_AMAGIC) strcat(d, "OVERLOAD,"); +#endif /* OVERLOAD */ + if (flags & SVp_IOK) strcat(d, "pIOK,"); + if (flags & SVp_NOK) strcat(d, "pNOK,"); + if (flags & SVp_POK) strcat(d, "pPOK,"); + if (flags & SVp_SCREAM) strcat(d, "SCREAM,"); + + switch (type) { + case SVt_PVCV: + if (CvANON(sv)) strcat(d, "ANON,"); + if (CvCLONE(sv)) strcat(d, "CLONE,"); + if (CvCLONED(sv)) strcat(d, "CLONED,"); + break; + case SVt_PVGV: + if (GvMULTI(sv)) strcat(d, "MULTI,"); +#ifdef OVERLOAD + if (flags & SVpgv_AM) strcat(d, "withOVERLOAD,"); +#endif /* OVERLOAD */ + } + + d += strlen(d); + if (d[-1] == ',') + d--; + *d++ = ')'; + *d = '\0'; + + PerlIO_printf(Perl_debug_log, "SV = "); + switch (type) { + case SVt_NULL: + PerlIO_printf(Perl_debug_log, "NULL%s\n", tmpbuf); + return; + case SVt_IV: + PerlIO_printf(Perl_debug_log, "IV%s\n", tmpbuf); + break; + case SVt_NV: + PerlIO_printf(Perl_debug_log, "NV%s\n", tmpbuf); + break; + case SVt_RV: + PerlIO_printf(Perl_debug_log, "RV%s\n", tmpbuf); + break; + case SVt_PV: + PerlIO_printf(Perl_debug_log, "PV%s\n", tmpbuf); + break; + case SVt_PVIV: + PerlIO_printf(Perl_debug_log, "PVIV%s\n", tmpbuf); + break; + case SVt_PVNV: + PerlIO_printf(Perl_debug_log, "PVNV%s\n", tmpbuf); + break; + case SVt_PVBM: + PerlIO_printf(Perl_debug_log, "PVBM%s\n", tmpbuf); + break; + case SVt_PVMG: + PerlIO_printf(Perl_debug_log, "PVMG%s\n", tmpbuf); + break; + case SVt_PVLV: + PerlIO_printf(Perl_debug_log, "PVLV%s\n", tmpbuf); + break; + case SVt_PVAV: + PerlIO_printf(Perl_debug_log, "PVAV%s\n", tmpbuf); + break; + case SVt_PVHV: + PerlIO_printf(Perl_debug_log, "PVHV%s\n", tmpbuf); + break; + case SVt_PVCV: + PerlIO_printf(Perl_debug_log, "PVCV%s\n", tmpbuf); + break; + case SVt_PVGV: + PerlIO_printf(Perl_debug_log, "PVGV%s\n", tmpbuf); + break; + case SVt_PVFM: + PerlIO_printf(Perl_debug_log, "PVFM%s\n", tmpbuf); + break; + case SVt_PVIO: + PerlIO_printf(Perl_debug_log, "PVIO%s\n", tmpbuf); + break; + default: + PerlIO_printf(Perl_debug_log, "UNKNOWN%s\n", tmpbuf); + return; + } + if (type >= SVt_PVIV || type == SVt_IV) + PerlIO_printf(Perl_debug_log, " IV = %ld\n", (long)SvIVX(sv)); + if (type >= SVt_PVNV || type == SVt_NV) + PerlIO_printf(Perl_debug_log, " NV = %.*g\n", DBL_DIG, SvNVX(sv)); + if (SvROK(sv)) { + PerlIO_printf(Perl_debug_log, " RV = 0x%lx\n", (long)SvRV(sv)); + sv_dump(SvRV(sv)); + return; + } + if (type < SVt_PV) + return; + if (type <= SVt_PVLV) { + if (SvPVX(sv)) + PerlIO_printf(Perl_debug_log, " PV = 0x%lx \"%s\"\n CUR = %ld\n LEN = %ld\n", + (long)SvPVX(sv), SvPVX(sv), (long)SvCUR(sv), (long)SvLEN(sv)); + else + PerlIO_printf(Perl_debug_log, " PV = 0\n"); + } + if (type >= SVt_PVMG) { + if (SvMAGIC(sv)) { + PerlIO_printf(Perl_debug_log, " MAGIC = 0x%lx\n", (long)SvMAGIC(sv)); + } + if (SvSTASH(sv)) + PerlIO_printf(Perl_debug_log, " STASH = \"%s\"\n", HvNAME(SvSTASH(sv))); + } + switch (type) { + case SVt_PVLV: + PerlIO_printf(Perl_debug_log, " TYPE = %c\n", LvTYPE(sv)); + PerlIO_printf(Perl_debug_log, " TARGOFF = %ld\n", (long)LvTARGOFF(sv)); + PerlIO_printf(Perl_debug_log, " TARGLEN = %ld\n", (long)LvTARGLEN(sv)); + PerlIO_printf(Perl_debug_log, " TARG = 0x%lx\n", (long)LvTARG(sv)); + sv_dump(LvTARG(sv)); + break; + case SVt_PVAV: + PerlIO_printf(Perl_debug_log, " ARRAY = 0x%lx\n", (long)AvARRAY(sv)); + PerlIO_printf(Perl_debug_log, " ALLOC = 0x%lx\n", (long)AvALLOC(sv)); + PerlIO_printf(Perl_debug_log, " FILL = %ld\n", (long)AvFILL(sv)); + PerlIO_printf(Perl_debug_log, " MAX = %ld\n", (long)AvMAX(sv)); + PerlIO_printf(Perl_debug_log, " ARYLEN = 0x%lx\n", (long)AvARYLEN(sv)); + flags = AvFLAGS(sv); + d = tmpbuf; + *d = '\0'; + if (flags & AVf_REAL) strcat(d, "REAL,"); + if (flags & AVf_REIFY) strcat(d, "REIFY,"); + if (flags & AVf_REUSED) strcat(d, "REUSED,"); + if (*d) + d[strlen(d)-1] = '\0'; + PerlIO_printf(Perl_debug_log, " FLAGS = (%s)\n", d); + break; + case SVt_PVHV: + PerlIO_printf(Perl_debug_log, " ARRAY = 0x%lx\n",(long)HvARRAY(sv)); + PerlIO_printf(Perl_debug_log, " KEYS = %ld\n", (long)HvKEYS(sv)); + PerlIO_printf(Perl_debug_log, " FILL = %ld\n", (long)HvFILL(sv)); + PerlIO_printf(Perl_debug_log, " MAX = %ld\n", (long)HvMAX(sv)); + PerlIO_printf(Perl_debug_log, " RITER = %ld\n", (long)HvRITER(sv)); + PerlIO_printf(Perl_debug_log, " EITER = 0x%lx\n",(long) HvEITER(sv)); + if (HvPMROOT(sv)) + PerlIO_printf(Perl_debug_log, " PMROOT = 0x%lx\n",(long)HvPMROOT(sv)); + if (HvNAME(sv)) + PerlIO_printf(Perl_debug_log, " NAME = \"%s\"\n", HvNAME(sv)); + break; + case SVt_PVFM: + case SVt_PVCV: + if (SvPOK(sv)) + PerlIO_printf(Perl_debug_log, " PROTOTYPE = \"%s\"\n", SvPV(sv,na)); + PerlIO_printf(Perl_debug_log, " STASH = 0x%lx\n", (long)CvSTASH(sv)); + PerlIO_printf(Perl_debug_log, " START = 0x%lx\n", (long)CvSTART(sv)); + PerlIO_printf(Perl_debug_log, " ROOT = 0x%lx\n", (long)CvROOT(sv)); + PerlIO_printf(Perl_debug_log, " XSUB = 0x%lx\n", (long)CvXSUB(sv)); + PerlIO_printf(Perl_debug_log, " XSUBANY = %ld\n", (long)CvXSUBANY(sv).any_i32); + PerlIO_printf(Perl_debug_log, " GV = 0x%lx", (long)CvGV(sv)); + if (CvGV(sv) && GvNAME(CvGV(sv))) { + PerlIO_printf(Perl_debug_log, " \"%s\"\n", GvNAME(CvGV(sv))); + } else { + PerlIO_printf(Perl_debug_log, "\n"); + } + PerlIO_printf(Perl_debug_log, " FILEGV = 0x%lx\n", (long)CvFILEGV(sv)); + PerlIO_printf(Perl_debug_log, " DEPTH = %ld\n", (long)CvDEPTH(sv)); + PerlIO_printf(Perl_debug_log, " PADLIST = 0x%lx\n", (long)CvPADLIST(sv)); + PerlIO_printf(Perl_debug_log, " OUTSIDE = 0x%lx\n", (long)CvOUTSIDE(sv)); + if (type == SVt_PVFM) + PerlIO_printf(Perl_debug_log, " LINES = %ld\n", (long)FmLINES(sv)); + break; + case SVt_PVGV: + PerlIO_printf(Perl_debug_log, " NAME = \"%s\"\n", GvNAME(sv)); + PerlIO_printf(Perl_debug_log, " NAMELEN = %ld\n", (long)GvNAMELEN(sv)); + PerlIO_printf(Perl_debug_log, " STASH = \"%s\"\n", HvNAME(GvSTASH(sv))); + PerlIO_printf(Perl_debug_log, " GP = 0x%lx\n", (long)GvGP(sv)); + PerlIO_printf(Perl_debug_log, " SV = 0x%lx\n", (long)GvSV(sv)); + PerlIO_printf(Perl_debug_log, " REFCNT = %ld\n", (long)GvREFCNT(sv)); + PerlIO_printf(Perl_debug_log, " IO = 0x%lx\n", (long)GvIOp(sv)); + PerlIO_printf(Perl_debug_log, " FORM = 0x%lx\n", (long)GvFORM(sv)); + PerlIO_printf(Perl_debug_log, " AV = 0x%lx\n", (long)GvAV(sv)); + PerlIO_printf(Perl_debug_log, " HV = 0x%lx\n", (long)GvHV(sv)); + PerlIO_printf(Perl_debug_log, " CV = 0x%lx\n", (long)GvCV(sv)); + PerlIO_printf(Perl_debug_log, " CVGEN = 0x%lx\n", (long)GvCVGEN(sv)); + PerlIO_printf(Perl_debug_log, " LASTEXPR = %ld\n", (long)GvLASTEXPR(sv)); + PerlIO_printf(Perl_debug_log, " LINE = %ld\n", (long)GvLINE(sv)); + PerlIO_printf(Perl_debug_log, " FLAGS = 0x%x\n", (int)GvFLAGS(sv)); + PerlIO_printf(Perl_debug_log, " STASH = \"%s\"\n", HvNAME(GvSTASH(sv))); + PerlIO_printf(Perl_debug_log, " EGV = 0x%lx\n", (long)GvEGV(sv)); + break; + case SVt_PVIO: + PerlIO_printf(Perl_debug_log, " IFP = 0x%lx\n", (long)IoIFP(sv)); + PerlIO_printf(Perl_debug_log, " OFP = 0x%lx\n", (long)IoOFP(sv)); + PerlIO_printf(Perl_debug_log, " DIRP = 0x%lx\n", (long)IoDIRP(sv)); + PerlIO_printf(Perl_debug_log, " LINES = %ld\n", (long)IoLINES(sv)); + PerlIO_printf(Perl_debug_log, " PAGE = %ld\n", (long)IoPAGE(sv)); + PerlIO_printf(Perl_debug_log, " PAGE_LEN = %ld\n", (long)IoPAGE_LEN(sv)); + PerlIO_printf(Perl_debug_log, " LINES_LEFT = %ld\n", (long)IoLINES_LEFT(sv)); + PerlIO_printf(Perl_debug_log, " TOP_NAME = \"%s\"\n", IoTOP_NAME(sv)); + PerlIO_printf(Perl_debug_log, " TOP_GV = 0x%lx\n", (long)IoTOP_GV(sv)); + PerlIO_printf(Perl_debug_log, " FMT_NAME = \"%s\"\n", IoFMT_NAME(sv)); + PerlIO_printf(Perl_debug_log, " FMT_GV = 0x%lx\n", (long)IoFMT_GV(sv)); + PerlIO_printf(Perl_debug_log, " BOTTOM_NAME = \"%s\"\n", IoBOTTOM_NAME(sv)); + PerlIO_printf(Perl_debug_log, " BOTTOM_GV = 0x%lx\n", (long)IoBOTTOM_GV(sv)); + PerlIO_printf(Perl_debug_log, " SUBPROCESS = %ld\n", (long)IoSUBPROCESS(sv)); + PerlIO_printf(Perl_debug_log, " TYPE = %c\n", IoTYPE(sv)); + PerlIO_printf(Perl_debug_log, " FLAGS = 0x%lx\n", (long)IoFLAGS(sv)); + break; + } +} +#else +void +sv_dump(sv) +SV* sv; +{ +} +#endif + +IO* +sv_2io(sv) +SV *sv; +{ + IO* io; + GV* gv; + + switch (SvTYPE(sv)) { + case SVt_PVIO: + io = (IO*)sv; + break; + case SVt_PVGV: + gv = (GV*)sv; + io = GvIO(gv); + if (!io) + croak("Bad filehandle: %s", GvNAME(gv)); + break; + default: + if (!SvOK(sv)) + croak(no_usym, "filehandle"); + if (SvROK(sv)) + return sv_2io(SvRV(sv)); + gv = gv_fetchpv(SvPV(sv,na), FALSE, SVt_PVIO); + if (gv) + io = GvIO(gv); + else + io = 0; + if (!io) + croak("Bad filehandle: %s", SvPV(sv,na)); + break; + } + return io; +} +