X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=ce85a4bb89a06059ad049c836897b7744d28bbbb;hb=e09f3e01ccd721309f0eb0aae224d84db2e8436a;hp=dfe3c785591dabbf6c449d118e550c5e1d015c0c;hpb=8990e3071044a96302560bbdb5706f3e74cf1bef;p=p5sagit%2Fp5-mst-13.2.git diff --git a/sv.c b/sv.c index dfe3c78..ce85a4b 100644 --- a/sv.c +++ b/sv.c @@ -1,186 +1,399 @@ -/* $RCSfile: sv.c,v $$Revision: 4.1 $$Date: 92/08/07 18:26:45 $ +/* sv.c * - * Copyright (c) 1991, Larry Wall + * Copyright (c) 1991-1997, 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(); +static IV asIV _((SV* sv)); +static UV asUV _((SV* sv)); +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* -new_sv() +#ifdef PURIFY + +#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 void +reg_add(sv) +SV* sv; { - SV* sv; - if (sv_root) { - sv = sv_root; - sv_root = (SV*)SvANY(sv); - ++sv_count; - 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; - --sv_count; + 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*)safemalloc(1012); - 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; - sv++; - SvANY(sv) = sv_arenaroot; - sv_arenaroot = sv_root; - return new_sv(); + SvFLAGS(sv) = SVTYPEMASK; } -void -sv_report_used() +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 (sv = sv_arenaroot; sv; sv = SvANY(sv)) { - svend = &sv[1008 / sizeof(SV)]; - while (sv < svend) { - if (SvTYPE(sv) != SVTYPEMASK) { - fprintf(stderr, "****\n"); - sv_dump(sv); - } - ++sv; + 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_clean_refs() +sv_report_used() { - register SV* sv; - register SV* svend; + visit(do_report_used); +} - for (sv = sv_arenaroot; sv; sv = SvANY(sv)) { - svend = &sv[1008 / sizeof(SV)]; - while (sv < svend) { - if (SvREFCNT(sv) == 1 && SvROK(sv)) { - DEBUG_D((fprintf(stderr, "Cleaning ref:\n "), sv_dump(sv));) - SvFLAGS(SvRV(sv)) |= SVf_BREAK; - SvFLAGS(sv) |= SVf_BREAK; - SvREFCNT_dec(sv); - } - ++sv; - } +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 + +static bool in_clean_objs = FALSE; void -sv_clean_magic() +sv_clean_objs() { - register SV* sv; - register SV* svend; + in_clean_objs = TRUE; +#ifndef DISABLE_DESTRUCTOR_KLUDGE + visit(do_clean_named_objs); +#endif + visit(do_clean_objs); + in_clean_objs = FALSE; +} - for (sv = sv_arenaroot; sv; sv = SvANY(sv)) { - svend = &sv[1008 / sizeof(SV)]; - while (sv < svend) { - if (SvTYPE(sv) != SVTYPEMASK && SvMAGICAL(sv)) { - DEBUG_D((fprintf(stderr, "Cleaning magic:\n "), sv_dump(sv));) - SvFLAGS(sv) |= SVf_BREAK; - sv_unmagic(sv); - SvREFCNT_dec(sv); - } - ++sv; - } - } +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 bool in_clean_all = FALSE; + void sv_clean_all() { - register SV* sv; - register SV* svend; + in_clean_all = TRUE; + visit(do_clean_all); + in_clean_all = FALSE; +} - for (sv = sv_arenaroot; sv; sv = SvANY(sv)) { - svend = &sv[1008 / sizeof(SV)]; - while (sv < svend) { - if (SvTYPE(sv) != SVTYPEMASK) { - DEBUG_D((fprintf(stderr, "Cleaning loops:\n "), sv_dump(sv));) - SvFLAGS(sv) |= SVf_BREAK; - SvREFCNT_dec(sv); - } - ++sv; - } +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.) */ + + 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* more_xiv(); + sv_arenaroot = 0; + sv_root = 0; +} 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(); @@ -190,31 +403,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*)safemalloc(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 XPVNV* more_xnv(); - static XPVNV* new_xnv() { @@ -239,7 +453,6 @@ XPVNV* p; static XPVNV* more_xnv() { - register int i; register double* xnv; register double* xnvend; xnv = (double*)safemalloc(1008); @@ -254,8 +467,6 @@ more_xnv() return new_xnv(); } -static XRV* more_xrv(); - static XRV* new_xrv() { @@ -279,7 +490,6 @@ XRV* p; static XRV* more_xrv() { - register int i; register XRV* xrv; register XRV* xrvend; xrv_root = (XRV*)safemalloc(1008); @@ -293,8 +503,6 @@ more_xrv() return new_xrv(); } -static XPV* more_xpv(); - static XPV* new_xpv() { @@ -318,7 +526,6 @@ XPV* p; static XPV* more_xpv() { - register int i; register XPV* xpv; register XPV* xpvend; xpv_root = (XPV*)safemalloc(1008); @@ -333,32 +540,10 @@ more_xpv() } #ifdef PURIFY - -#define new_SV() sv = (SV*)safemalloc(sizeof(SV)) -#define del_SV(p) free((char*)p) - -#else - -#define new_SV() \ - if (sv_root) { \ - sv = sv_root; \ - sv_root = (SV*)SvANY(sv); \ - ++sv_count; \ - } \ - else \ - sv = more_sv(); -#define del_SV(p) \ - SvANY(p) = sv_root; \ - sv_root = p; \ - --sv_count; - -#endif - -#ifdef PURIFY #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 @@ -366,7 +551,7 @@ more_xpv() #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 @@ -374,7 +559,7 @@ more_xpv() #define new_XRV() (void*)safemalloc(sizeof(XRV)) #define del_XRV(p) free((char*)p) #else -#define new_XRV() new_xrv() +#define new_XRV() (void*)new_xrv() #define del_XRV(p) del_xrv(p) #endif @@ -382,7 +567,7 @@ more_xpv() #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 @@ -427,7 +612,7 @@ U32 mt; char* pv; U32 cur; U32 len; - I32 iv; + IV iv; double nv; MAGIC* magic; HV* stash; @@ -435,6 +620,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; @@ -476,14 +664,13 @@ U32 mt; pv = (char*)SvRV(sv); cur = 0; len = 0; - iv = (I32)pv; + 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); @@ -492,9 +679,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); @@ -505,7 +695,6 @@ U32 mt; del_XPVIV(SvANY(sv)); break; case SVt_PVNV: - nv = SvNVX(sv); pv = SvPVX(sv); cur = SvCUR(sv); len = SvLEN(sv); @@ -543,7 +732,6 @@ U32 mt; case SVt_RV: SvANY(sv) = new_XRV(); SvRV(sv) = (SV*)pv; - SvOK_on(sv); break; case SVt_PV: SvANY(sv) = new_XPV(); @@ -558,7 +746,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: @@ -597,9 +785,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; @@ -626,6 +814,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; @@ -633,15 +822,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(); @@ -656,6 +836,7 @@ U32 mt; GvNAME(sv) = 0; GvNAMELEN(sv) = 0; GvSTASH(sv) = 0; + GvFLAGS(sv) = 0; break; case SVt_PVBM: SvANY(sv) = new_XPVBM(); @@ -672,6 +853,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; @@ -679,10 +861,10 @@ 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; @@ -690,22 +872,7 @@ U32 mt; SvNVX(sv) = nv; SvMAGIC(sv) = magic; SvSTASH(sv) = stash; - IoIFP(sv) = 0; - IoOFP(sv) = 0; - IoDIRP(sv) = 0; - IoLINES(sv) = 60; - IoPAGE(sv) = 0; - IoPAGE_LEN(sv) = 0; - IoLINES_LEFT(sv)= 0; - IoTOP_NAME(sv) = 0; - IoTOP_GV(sv) = 0; - IoFMT_NAME(sv) = 0; - IoFMT_GV(sv) = 0; - IoBOTTOM_NAME(sv)= 0; - IoBOTTOM_GV(sv) = 0; - IoSUBPROCESS(sv)= 0; - IoTYPE(sv) = 0; - IoFLAGS(sv) = 0; + IoPAGE_LEN(sv) = 60; break; } SvFLAGS(sv) &= ~SVTYPEMASK; @@ -713,109 +880,154 @@ U32 mt; return TRUE; } +#ifdef DEBUGGING char * sv_peek(sv) register SV *sv; { - char *t = tokenbuf; - *t = '\0'; + SV *t = sv_newmortal(); + STRLEN prevlen; + int unref = 0; + sv_setpvn(t, "", 0); retry: if (!sv) { - strcpy(t, "VOID"); - return tokenbuf; + sv_catpv(t, "VOID"); + goto finish; } else if (sv == (SV*)0x55555555 || SvTYPE(sv) == 'U') { - strcpy(t, "WILD"); - return tokenbuf; + sv_catpv(t, "WILD"); + goto finish; } - else if (SvREFCNT(sv) == 0 && !SvREADONLY(sv)) { - strcpy(t, "UNREF"); - return tokenbuf; + else if (sv == &sv_undef || sv == &sv_no || sv == &sv_yes) { + if (sv == &sv_undef) { + sv_catpv(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) { + sv_catpv(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 { + sv_catpv(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; + } + sv_catpv(t, ":"); } - else { - switch (SvTYPE(sv)) { - default: - strcpy(t,"FREED"); - return tokenbuf; - 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: - *t++ = '\\'; - if (t - tokenbuf > 10) { - strcpy(tokenbuf + 3,"..."); - return tokenbuf; - } - sv = (SV*)SvRV(sv); - goto retry; - 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()"); - return tokenbuf; - 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; + else if (SvREFCNT(sv) == 0) { + sv_catpv(t, "("); + unref++; + } + if (SvROK(sv)) { + sv_catpv(t, "\\"); + if (SvCUR(t) + unref > 10) { + SvCUR(t) = unref + 3; + *SvEND(t) = '\0'; + sv_catpv(t, "..."); + goto finish; } + sv = (SV*)SvRV(sv); + goto retry; } - t += strlen(t); + switch (SvTYPE(sv)) { + default: + sv_catpv(t, "FREED"); + goto finish; - if (SvPOK(sv)) { + case SVt_NULL: + sv_catpv(t, "UNDEF"); + return tokenbuf; + case SVt_IV: + sv_catpv(t, "IV"); + break; + case SVt_NV: + sv_catpv(t, "NV"); + break; + case SVt_RV: + sv_catpv(t, "RV"); + break; + case SVt_PV: + sv_catpv(t, "PV"); + break; + case SVt_PVIV: + sv_catpv(t, "PVIV"); + break; + case SVt_PVNV: + sv_catpv(t, "PVNV"); + break; + case SVt_PVMG: + sv_catpv(t, "PVMG"); + break; + case SVt_PVLV: + sv_catpv(t, "PVLV"); + break; + case SVt_PVAV: + sv_catpv(t, "AV"); + break; + case SVt_PVHV: + sv_catpv(t, "HV"); + break; + case SVt_PVCV: + if (CvGV(sv)) + sv_catpvf(t, "CV(%s)", GvNAME(CvGV(sv))); + else + sv_catpv(t, "CV()"); + goto finish; + case SVt_PVGV: + sv_catpv(t, "GV"); + break; + case SVt_PVBM: + sv_catpv(t, "BM"); + break; + case SVt_PVFM: + sv_catpv(t, "FM"); + break; + case SVt_PVIO: + sv_catpv(t, "IO"); + break; + } + + if (SvPOKp(sv)) { if (!SvPVX(sv)) - return "(null)"; + sv_catpv(t, "(null)"); if (SvOOK(sv)) - sprintf(t,"(%ld+\"%0.127s\")",(long)SvIVX(sv),SvPVX(sv)); + sv_catpvf(t, "(%ld+\"%.127s\")",(long)SvIVX(sv),SvPVX(sv)); else - sprintf(t,"(\"%0.127s\")",SvPVX(sv)); + sv_catpvf(t, "(\"%.127s\")",SvPVX(sv)); } - else if (SvNOK(sv)) - sprintf(t,"(%g)",SvNVX(sv)); - else if (SvIOK(sv)) - sprintf(t,"(%ld)",(long)SvIVX(sv)); + else if (SvNOKp(sv)) { + SET_NUMERIC_STANDARD(); + sv_catpvf(t, "(%g)",SvNVX(sv)); + } + else if (SvIOKp(sv)) + sv_catpvf(t, "(%ld)",(long)SvIVX(sv)); else - strcpy(t,"()"); - return tokenbuf; + sv_catpv(t, "()"); + + finish: + if (unref) { + while (unref--) + sv_catpv(t, ")"); + } + return SvPV(t, na); } +#endif int sv_backoff(sv) @@ -830,6 +1042,7 @@ register SV *sv; Move(s, SvPVX(sv), SvCUR(sv)+1, char); } SvFLAGS(sv) &= ~SVf_OOK; + return 0; } char * @@ -843,16 +1056,14 @@ unsigned long newlen; { register char *s; -#ifdef MSDOS +#ifdef HAS_64K_LIMIT 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 (SvTHINKFIRST(sv)) { - if (SvROK(sv)) - sv_unref(sv); - } +#endif /* HAS_64K_LIMIT */ + if (SvROK(sv)) + sv_unref(sv); if (SvTYPE(sv) < SVt_PV) { sv_upgrade(sv, SVt_PV); s = SvPVX(sv); @@ -866,7 +1077,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); @@ -879,7 +1090,7 @@ unsigned long newlen; void sv_setiv(sv,i) register SV *sv; -I32 i; +IV i; { if (SvTHINKFIRST(sv)) { if (SvREADONLY(sv) && curcop != &compiling) @@ -898,36 +1109,141 @@ I32 i; 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_desc[op->op_type]); } + (void)SvIOK_only(sv); /* validate number */ SvIVX(sv) = i; - SvIOK_only(sv); /* validate number */ SvTAINT(sv); } void -sv_setnv(sv,num) +sv_setuv(sv,u) register SV *sv; -double num; +UV u; { - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv) && curcop != &compiling) + if (u <= IV_MAX) + sv_setiv(sv, u); + else + sv_setnv(sv, (double)u); +} + +void +sv_setnv(sv,num) +register SV *sv; +double num; +{ + if (SvTHINKFIRST(sv)) { + if (SvREADONLY(sv) && curcop != &compiling) croak(no_modify); if (SvROK(sv)) sv_unref(sv); } - if (SvTYPE(sv) < SVt_NV) + 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; + char *limit = tmpbuf + sizeof(tmpbuf) - 8; + /* each *s can expand to 4 chars + "...\0", + i.e. need room for 8 chars */ + + for (s = SvPVX(sv); *s && d < limit; s++) { + int ch = *s & 0xFF; + if (ch & 128 && !isPRINT_LC(ch)) { + *d++ = 'M'; + *d++ = '-'; + ch &= 127; + } + if (ch == '\n') { + *d++ = '\\'; + *d++ = 'n'; + } + else if (ch == '\r') { + *d++ = '\\'; + *d++ = 'r'; + } + else if (ch == '\f') { + *d++ = '\\'; + *d++ = 'f'; + } + else if (ch == '\\') { + *d++ = '\\'; + *d++ = '\\'; + } + else if (isPRINT_LC(ch)) + *d++ = ch; + else { + *d++ = '^'; + *d++ = toCTRL(ch); + } + } + 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; { @@ -937,31 +1253,47 @@ register SV *sv; mg_get(sv); if (SvIOKp(sv)) return SvIVX(sv); - if (SvNOKp(sv)) - return (I32)SvNVX(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)) - return (I32)atol(SvPVX(sv)); - return 0; + return asIV(sv); + if (!SvROK(sv)) { + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0; + } } if (SvTHINKFIRST(sv)) { - if (SvROK(sv)) - return (I32)SvRV(sv); -#ifdef TOOSTRICT + 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 (SvNOK(sv)) - return (I32)SvNVX(sv); - if (SvPOK(sv) && SvLEN(sv)) - return (I32)atol(SvPVX(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)) + return asIV(sv); if (dowarn) warn(warn_uninit); return 0; } -#endif } switch (SvTYPE(sv)) { case SVt_NULL: sv_upgrade(sv, SVt_IV); - return SvIVX(sv); + break; case SVt_PV: sv_upgrade(sv, SVt_PVIV); break; @@ -969,28 +1301,96 @@ 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 + SvUVX(sv) = U_V(SvNVX(sv)); + } + else if (SvPOKp(sv) && SvLEN(sv)) { + (void)SvIOK_on(sv); + SvIVX(sv) = asIV(sv); } else { - if (dowarn) + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) warn(warn_uninit); - SvUPGRADE(sv, SVt_IV); - SvIVX(sv) = 0; + return 0; } - SvIOK_on(sv); - DEBUG_c((stderr,"0x%lx 2iv(%ld)\n",sv,(long)SvIVX(sv))); + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2iv(%ld)\n", + (unsigned long)sv,(long)SvIVX(sv))); return SvIVX(sv); } +UV +sv_2uv(sv) +register SV *sv; +{ + if (!sv) + return 0; + if (SvGMAGICAL(sv)) { + mg_get(sv); + if (SvIOKp(sv)) + return SvUVX(sv); + if (SvNOKp(sv)) + return U_V(SvNVX(sv)); + if (SvPOKp(sv) && SvLEN(sv)) + return asUV(sv); + if (!SvROK(sv)) { + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0; + } + } + if (SvTHINKFIRST(sv)) { + if (SvROK(sv)) { +#ifdef OVERLOAD + SV* tmpstr; + if (SvAMAGIC(sv) && (tmpstr=AMG_CALLun(sv, numer))) + return SvUV(tmpstr); +#endif /* OVERLOAD */ + return (UV)SvRV(sv); + } + if (SvREADONLY(sv)) { + if (SvNOKp(sv)) { + return U_V(SvNVX(sv)); + } + if (SvPOKp(sv) && SvLEN(sv)) + return asUV(sv); + if (dowarn) + warn(warn_uninit); + return 0; + } + } + switch (SvTYPE(sv)) { + case SVt_NULL: + sv_upgrade(sv, SVt_IV); + break; + case SVt_PV: + sv_upgrade(sv, SVt_PVIV); + break; + case SVt_NV: + sv_upgrade(sv, SVt_PVNV); + break; + } + if (SvNOKp(sv)) { + (void)SvIOK_on(sv); + SvUVX(sv) = U_V(SvNVX(sv)); + } + else if (SvPOKp(sv) && SvLEN(sv)) { + (void)SvIOK_on(sv); + SvUVX(sv) = asUV(sv); + } + else { + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0; + } + DEBUG_c(PerlIO_printf(Perl_debug_log, "0x%lx 2uv(%lu)\n", + (unsigned long)sv,SvUVX(sv))); + return SvUVX(sv); +} + double sv_2nv(sv) register SV *sv; @@ -1001,60 +1401,190 @@ register SV *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); + SET_NUMERIC_STANDARD(); return atof(SvPVX(sv)); + } if (SvIOKp(sv)) return (double)SvIVX(sv); - return 0; + if (!SvROK(sv)) { + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + return 0; + } } if (SvTHINKFIRST(sv)) { - if (SvROK(sv)) - return (double)(unsigned long)SvRV(sv); -#ifdef TOOSTRICT + 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 (SvPOK(sv) && SvLEN(sv)) + if (SvPOKp(sv) && SvLEN(sv)) { + if (dowarn && !SvIOKp(sv) && !looks_like_number(sv)) + not_a_number(sv); + SET_NUMERIC_STANDARD(); return atof(SvPVX(sv)); - if (SvIOK(sv)) + } + if (SvIOKp(sv)) return (double)SvIVX(sv); if (dowarn) warn(warn_uninit); return 0.0; } -#endif } if (SvTYPE(sv) < SVt_NV) { 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))); + DEBUG_c(SET_NUMERIC_STANDARD()); + 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); + SET_NUMERIC_STANDARD(); SvNVX(sv) = atof(SvPVX(sv)); } else { - if (dowarn) + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) warn(warn_uninit); - SvNVX(sv) = 0.0; + return 0.0; } SvNOK_on(sv); - DEBUG_c((stderr,"0x%lx 2nv(%g)\n",sv,SvNVX(sv))); + DEBUG_c(SET_NUMERIC_STANDARD()); + DEBUG_c(PerlIO_printf(Perl_debug_log, + "0x%lx 2nv(%g)\n",(unsigned long)sv,SvNVX(sv))); return SvNVX(sv); } +static IV +asIV(sv) +SV *sv; +{ + I32 numtype = looks_like_number(sv); + double d; + + if (numtype == 1) + return atol(SvPVX(sv)); + if (!numtype && dowarn) + not_a_number(sv); + SET_NUMERIC_STANDARD(); + d = atof(SvPVX(sv)); + if (d < 0.0) + return I_V(d); + else + return (IV) U_V(d); +} + +static UV +asUV(sv) +SV *sv; +{ + I32 numtype = looks_like_number(sv); + + if (numtype == 1) + return atol(SvPVX(sv)); + if (!numtype && dowarn) + not_a_number(sv); + SET_NUMERIC_STANDARD(); + return U_V(atof(SvPVX(sv))); +} + +I32 +looks_like_number(sv) +SV *sv; +{ + register char *s; + register char *send; + register char *sbegin; + I32 numtype; + STRLEN len; + + if (SvPOK(sv)) { + sbegin = SvPVX(sv); + len = SvCUR(sv); + } + else if (SvPOKp(sv)) + sbegin = SvPV(sv, len); + else + return 1; + send = sbegin + len; + + s = sbegin; + while (isSPACE(*s)) + s++; + if (*s == '+' || *s == '-') + s++; + + /* next must be digit or '.' */ + if (isDIGIT(*s)) { + do { + s++; + } while (isDIGIT(*s)); + if (*s == '.') { + s++; + while (isDIGIT(*s)) /* optional digits after "." */ + s++; + } + } + else if (*s == '.') { + s++; + /* no digits before '.' means we need digits after it */ + if (isDIGIT(*s)) { + do { + s++; + } while (isDIGIT(*s)); + } + else + return 0; + } + else + return 0; + + /* + * we return 1 if the number can be converted to _integer_ with atol() + * and 2 if you need (int)atof(). + */ + numtype = 1; + + /* we can have an optional exponent part */ + if (*s == 'e' || *s == 'E') { + numtype = 2; + s++; + if (*s == '+' || *s == '-') + s++; + if (isDIGIT(*s)) { + do { + s++; + } while (isDIGIT(*s)); + } + else + return 0; + } + while (isSPACE(*s)) + s++; + if (s >= send) + return numtype; + if (len == 10 && memEQ(sbegin, "0 but true", 10)) + return 1; + return 0; +} + char * sv_2pv(sv, lp) register SV *sv; @@ -1062,6 +1592,7 @@ STRLEN *lp; { register char *s; int olderrno; + SV *tsv; if (!sv) { *lp = 0; @@ -1074,20 +1605,30 @@ STRLEN *lp; return SvPVX(sv); } if (SvIOKp(sv)) { - (void)sprintf(tokenbuf,"%ld",SvIVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + (void)sprintf(tokenbuf,"%ld",(long)SvIVX(sv)); + tsv = Nullsv; + goto tokensave; } if (SvNOKp(sv)) { - (void)sprintf(tokenbuf,"%.20g",SvNVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + SET_NUMERIC_STANDARD(); + Gconvert(SvNVX(sv), DBL_DIG, 0, tokenbuf); + tsv = Nullsv; + goto tokensave; } - *lp = 0; - return ""; + if (!SvROK(sv)) { + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) + warn(warn_uninit); + *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"; @@ -1108,85 +1649,129 @@ STRLEN *lp; case SVt_PVCV: s = "CODE"; break; case SVt_PVGV: s = "GLOB"; break; case SVt_PVFM: s = "FORMATLINE"; break; - case SVt_PVIO: s = "FILEHANDLE"; break; + case SVt_PVIO: s = "IO"; break; default: s = "UNKNOWN"; break; } + tsv = NEWSV(0,0); if (SvOBJECT(sv)) - sprintf(tokenbuf, "%s=%s(0x%lx)", - HvNAME(SvSTASH(sv)), s, (unsigned long)sv); + sv_setpvf(tsv, "%s=%s", HvNAME(SvSTASH(sv)), s); else - sprintf(tokenbuf, "%s(0x%lx)", s, (unsigned long)sv); - s = tokenbuf; + sv_setpv(tsv, s); + sv_catpvf(tsv, "(0x%lx)", (unsigned long)sv); + goto tokensaveref; } *lp = strlen(s); return s; } -#ifdef TOOSTRICT if (SvREADONLY(sv)) { - if (SvIOK(sv)) { - (void)sprintf(tokenbuf,"%ld",SvIVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + if (SvNOKp(sv)) { + SET_NUMERIC_STANDARD(); + Gconvert(SvNVX(sv), DBL_DIG, 0, tokenbuf); + tsv = Nullsv; + goto tokensave; } - if (SvNOK(sv)) { - (void)sprintf(tokenbuf,"%.20g",SvNVX(sv)); - *lp = strlen(tokenbuf); - return tokenbuf; + if (SvIOKp(sv)) { + (void)sprintf(tokenbuf,"%ld",(long)SvIVX(sv)); + tsv = Nullsv; + goto tokensave; } if (dowarn) warn(warn_uninit); *lp = 0; return ""; } -#endif } 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*/ + { + SET_NUMERIC_STANDARD(); + 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--; + *--s = '\0'; #endif } - else if (SvIOK(sv)) { + else if (SvIOKp(sv)) { + U32 oldIOK = SvIOK(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)); + sv_setpvf(sv, "%Vd", SvIVX(sv)); errno = olderrno; - while (*s) s++; + s = SvEND(sv); + if (oldIOK) + SvIOK_on(sv); + else + SvIOKp_on(sv); } else { - if (dowarn) + if (dowarn && !localizing && !(SvFLAGS(sv) & SVs_PADTMP)) warn(warn_uninit); - sv_grow(sv, 1); - s = SvPVX(sv); + *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: + if (!tsv) + tsv = newSVpv(tokenbuf, 0); + sv_2mortal(tsv); + *lp = SvCUR(tsv); + return SvPVX(tsv); + } + else { + STRLEN len; + char *t; + + if (tsv) { + sv_2mortal(tsv); + t = SvPVX(tsv); + len = SvCUR(tsv); + } + else { + t = tokenbuf; + len = strlen(tokenbuf); + } +#ifdef FIXNEGATIVEZERO + if (len == 2 && t[0] == '-' && t[1] == '0') { + t = "0"; + len = 1; + } +#endif + (void)SvUPGRADE(sv, SVt_PV); + *lp = len; + s = SvGROW(sv, len + 1); + SvCUR_set(sv, len); + (void)strcpy(s, t); + SvPOKp_on(sv); + return s; + } } /* This function is only called on magical items */ @@ -1197,8 +1782,18 @@ register SV *sv; if (SvGMAGICAL(sv)) mg_get(sv); - if (SvROK(sv)) - return SvRV(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)) && @@ -1248,37 +1843,57 @@ register SV *sstr; 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 (stype) { case SVt_NULL: - SvOK_off(dstr); + (void)SvOK_off(dstr); return; case SVt_IV: - if (dtype <= SVt_PV) { + if (dtype != SVt_IV && dtype < SVt_PVIV) { if (dtype < SVt_IV) sv_upgrade(dstr, SVt_IV); - else if (dtype == SVt_PV) - sv_upgrade(dstr, SVt_PVIV); else if (dtype == SVt_NV) sv_upgrade(dstr, SVt_PVNV); + else + sv_upgrade(dstr, SVt_PVIV); } break; case SVt_NV: - if (dtype <= SVt_PVIV) { + if (dtype != SVt_NV && dtype < SVt_PVNV) { if (dtype < SVt_NV) sv_upgrade(dstr, SVt_NV); - else if (dtype == SVt_PV) - sv_upgrade(dstr, SVt_PVNV); - else if (dtype == SVt_PVIV) + else 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: + case SVt_PVFM: if (dtype < SVt_PV) sv_upgrade(dstr, SVt_PV); break; @@ -1290,30 +1905,63 @@ register SV *sstr; if (dtype < SVt_PVNV) sv_upgrade(dstr, SVt_PVNV); 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 (dtype <= 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 */ + } + /* ahem, death to those who redefine active sort subs */ + else if (curstack == sortstack + && GvCV(dstr) && sortcop == CvSTART(GvCV(dstr))) + croak("Can't redefine active sort subroutine %s", + GvNAME(dstr)); + (void)SvOK_off(dstr); + GvINTRO_off(dstr); /* one-shot flag */ + gp_free((GV*)dstr); GvGP(dstr) = gp_ref(GvGP(sstr)); SvTAINT(dstr); + if (curcop->cop_stash != GvSTASH(dstr)) + GvIMPORTED_on(dstr); + GvMULTI_on(dstr); return; } /* FALL THROUGH */ default: + if (SvGMAGICAL(sstr)) { + mg_get(sstr); + if (SvTYPE(sstr) != stype) { + stype = SvTYPE(sstr); + if (stype == SVt_PVGV && dtype <= SVt_PVGV) + goto glob_assign; + } + } if (dtype < stype) sv_upgrade(dstr, stype); - if (SvGMAGICAL(sstr)) - mg_get(sstr); } sflags = SvFLAGS(sstr); @@ -1323,47 +1971,127 @@ register SV *sstr; if (dtype == SVt_PVGV) { SV *sref = SvREFCNT_inc(SvRV(sstr)); SV *dref = 0; - GP *oldgp = GvGP(dstr); - GP *gp; - + 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_ref(gp); + GvSV(dstr) = NEWSV(72,0); + GvLINE(dstr) = curcop->cop_line; + GvEGV(dstr) = (GV*)dstr; + } + GvMULTI_on(dstr); switch (SvTYPE(sref)) { case SVt_PVAV: - dref = (SV*)GvAV(dstr); + 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: - dref = (SV*)GvHV(dstr); + 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: - dref = (SV*)GvCV(dstr); - GvCV(dstr) = (CV*)sref; + if (intro) { + if (GvCVGEN(dstr) && GvCV(dstr) != (CV*)sref) { + SvREFCNT_dec(GvCV(dstr)); + GvCV(dstr) = Nullcv; + GvCVGEN(dstr) = 0; /* Switch off cacheness. */ + sub_generation++; + } + SAVESPTR(GvCV(dstr)); + } + else + dref = (SV*)GvCV(dstr); + if (GvCV(dstr) != (CV*)sref) { + CV* cv = GvCV(dstr); + if (cv) { + if (!GvCVGEN((GV*)dstr) && + (CvROOT(cv) || CvXSUB(cv))) + { + /* ahem, death to those who redefine + * active sort subs */ + if (curstack == sortstack && + sortcop == CvSTART(cv)) + croak( + "Can't redefine active sort subroutine %s", + GvENAME((GV*)dstr)); + if (cv_const_sv(cv)) + warn("Constant subroutine %s redefined", + GvENAME((GV*)dstr)); + else if (dowarn) + warn("Subroutine %s redefined", + GvENAME((GV*)dstr)); + } + cv_ckproto(cv, (GV*)dstr, + SvPOK(sref) ? SvPVX(sref) : Nullch); + } + GvCV(dstr) = (CV*)sref; + GvCVGEN(dstr) = 0; /* Switch off cacheness. */ + GvASSUMECV_on(dstr); + sub_generation++; + } + 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: - dref = (SV*)GvSV(dstr); + 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)) + if (SvPVX(dstr)) { + (void)SvOOK_off(dstr); /* backoff */ Safefree(SvPVX(dstr)); + SvLEN(dstr)=SvCUR(dstr)=0; + } } - SvOK_off(dstr); + (void)SvOK_off(dstr); SvRV(dstr) = SvREFCNT_inc(SvRV(sstr)); SvROK_on(dstr); - ++sv_rvcount; if (sflags & SVp_NOK) { SvNOK_on(dstr); SvNVX(dstr) = SvNVX(sstr); } if (sflags & SVp_IOK) { - SvIOK_on(dstr); + (void)SvIOK_on(dstr); SvIVX(dstr) = SvIVX(sstr); } +#ifdef OVERLOAD + if (SvAMAGIC(sstr)) { + SvAMAGIC_on(dstr); + } +#endif /* OVERLOAD */ } else if (sflags & SVp_POK) { @@ -1374,20 +2102,27 @@ 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 */ STRLEN len = SvCUR(sstr); @@ -1396,7 +2131,7 @@ register SV *sstr; Move(SvPVX(sstr),SvPVX(dstr),len,char); SvCUR_set(dstr, len); *SvEND(dstr) = '\0'; - SvPOK_only(dstr); + (void)SvPOK_only(dstr); } /*SUPPRESS 560*/ if (sflags & SVp_NOK) { @@ -1404,24 +2139,24 @@ register SV *sstr; SvNVX(dstr) = SvNVX(sstr); } if (sflags & SVp_IOK) { - SvIOK_on(dstr); + (void)SvIOK_on(dstr); SvIVX(dstr) = SvIVX(sstr); } } 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 (sflags & SVp_IOK) { - SvIOK_only(dstr); + (void)SvIOK_only(dstr); SvIVX(dstr) = SvIVX(sstr); } else { - SvOK_off(dstr); + (void)SvOK_off(dstr); } SvTAINT(dstr); } @@ -1429,9 +2164,11 @@ register SV *sstr; void sv_setpvn(sv,ptr,len) register SV *sv; -register char *ptr; +register const char *ptr; register STRLEN len; { + 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); @@ -1439,24 +2176,27 @@ register STRLEN len; 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); } void sv_setpv(sv,ptr) register SV *sv; -register char *ptr; +register const char *ptr; { register STRLEN len; @@ -1467,16 +2207,20 @@ register char *ptr; 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); } @@ -1495,7 +2239,7 @@ register STRLEN len; if (!SvUPGRADE(sv, SVt_PV)) return; if (!ptr) { - SvOK_off(sv); + (void)SvOK_off(sv); return; } if (SvPVX(sv)) @@ -1505,7 +2249,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); } @@ -1516,7 +2260,7 @@ register char *ptr; { register STRLEN delta; - if (!ptr || !SvPOK(sv)) + if (!ptr || !SvPOKp(sv)) return; if (SvTHINKFIRST(sv)) { if (SvREADONLY(sv) && curcop != &compiling) @@ -1546,22 +2290,16 @@ register char *ptr; register STRLEN len; { STRLEN tlen; - char *s; - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv) && curcop != &compiling) - croak(no_modify); - if (SvROK(sv)) { - s = SvPV(sv, tlen); - sv_unref(sv); - sv_setpvn(sv, s, tlen); - } - } - 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); } @@ -1585,22 +2323,18 @@ register char *ptr; { register STRLEN len; STRLEN tlen; - char *s; + char *junk; - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv) && curcop != &compiling) - croak(no_modify); - if (SvROK(sv)) - sv_unref(sv); - } 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); } @@ -1615,7 +2349,7 @@ STRLEN len; { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -1626,27 +2360,26 @@ STRLEN len; return sv; } +/* name is assumed to contain an SV* if (name && namelen == HEf_SVKEY) */ + void -#ifndef STANDARD_C sv_magic(sv, obj, how, name, namlen) register SV *sv; SV *obj; -char how; +int how; char *name; I32 namlen; -#else -sv_magic(register SV *sv, SV *obj, char how, char *name, I32 namlen) -#endif /* STANDARD_C */ { MAGIC* mg; - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv) && curcop != &compiling) - croak(no_modify); - } - if (SvMAGICAL(sv)) { - if (SvMAGIC(sv) && mg_find(sv, how)) + if (SvREADONLY(sv) && curcop != &compiling && !strchr("gBf", how)) + croak(no_modify); + 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)) @@ -1656,24 +2389,44 @@ sv_magic(register SV *sv, SV *obj, char how, char *name, I32 namlen) mg->mg_moremagic = SvMAGIC(sv); SvMAGIC(sv) = mg; - if (obj == sv) + if (!obj || obj == sv || how == '#') mg->mg_obj = obj; - else + 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; case 'E': mg->mg_virtual = &vtbl_env; break; + case 'f': + mg->mg_virtual = &vtbl_fm; + break; case 'e': mg->mg_virtual = &vtbl_envelem; break; @@ -1686,16 +2439,26 @@ sv_magic(register SV *sv, SV *obj, char how, char *name, 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': mg->mg_virtual = &vtbl_dbline; break; +#ifdef USE_LOCALE_COLLATE + case 'o': + mg->mg_virtual = &vtbl_collxfrm; + break; +#endif /* USE_LOCALE_COLLATE */ case 'P': mg->mg_virtual = &vtbl_pack; break; case 'p': + case 'q': mg->mg_virtual = &vtbl_packelem; break; case 'S': @@ -1706,6 +2469,7 @@ sv_magic(register SV *sv, SV *obj, char how, char *name, I32 namlen) break; case 't': mg->mg_virtual = &vtbl_taint; + mg->mg_len = 1; break; case 'U': mg->mg_virtual = &vtbl_uvar; @@ -1716,12 +2480,24 @@ sv_magic(register SV *sv, SV *obj, char how, char *name, I32 namlen) case 'x': mg->mg_virtual = &vtbl_substr; break; + case 'y': + mg->mg_virtual = &vtbl_defelem; + break; case '*': mg->mg_virtual = &vtbl_glob; break; 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); } @@ -1731,17 +2507,13 @@ sv_magic(register SV *sv, SV *obj, char how, char *name, I32 namlen) } int -#ifndef STANDARD_C sv_unmagic(sv, type) SV* sv; -char type; -#else -sv_unmagic(SV *sv, char type) -#endif /* STANDARD_C */ +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) { @@ -1751,8 +2523,12 @@ sv_unmagic(SV *sv, char type) if (vtbl && vtbl->svt_free) (*vtbl->svt_free)(sv, mg); if (mg->mg_ptr && mg->mg_type != 'g') - Safefree(mg->mg_ptr); - SvREFCNT_dec(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 @@ -1782,20 +2558,11 @@ STRLEN littlelen; if (!bigstr) croak("Can't modify non-existent substring"); - if (SvTHINKFIRST(bigstr)) { - if (SvREADONLY(bigstr) && curcop != &compiling) - croak(no_modify); - if (SvROK(bigstr)) - sv_unref(bigstr); - } - SvPOK_only(bigstr); + 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; @@ -1873,16 +2640,21 @@ register SV *nsv; 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; } SvREFCNT(sv) = 0; sv_clear(sv); + assert(!SvREFCNT(sv)); StructCopy(nsv,sv,SV); SvREFCNT(sv) = refcnt; + SvFLAGS(nsv) |= SVTYPEMASK; /* Mark as freed */ del_SV(nsv); } @@ -1894,96 +2666,110 @@ register SV *sv; assert(SvREFCNT(sv) == 0); if (SvOBJECT(sv)) { - dSP; - BINOP myop; /* fake syntax tree node */ - GV* destructor; - - SvOBJECT_off(sv); /* 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; - Zero(&ref, 1, SV); - sv_upgrade(&ref, SVt_RV); - SvRV(&ref) = SvREFCNT_inc(sv); - SvROK_on(&ref); - - 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; - } - SvREFCNT_dec(SvSTASH(sv)); - LEAVE; + if (defstash) { /* Still have a symbol table? */ + dSP; + GV* destructor; + + ENTER; + SAVEFREESV(SvSTASH(sv)); + + destructor = gv_fetchmethod(SvSTASH(sv), "DESTROY"); + if (destructor) { + SV ref; + + Zero(&ref, 1, SV); + sv_upgrade(&ref, SVt_RV); + SvRV(&ref) = SvREFCNT_inc(sv); + SvROK_on(&ref); + SvREFCNT(&ref) = 1; /* Fake, but otherwise + creating+destructing a ref + leads to disaster. */ + + EXTEND(SP, 2); + PUSHMARK(SP); + PUSHs(&ref); + PUTBACK; + perl_call_sv((SV*)GvCV(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 { + if (in_clean_objs) + croak("DESTROY created new reference to dead object"); + /* DESTROY gave object new lease on life */ + return; + } + } } + if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv)) + mg_free(sv); switch (SvTYPE(sv)) { case SVt_PVIO: + if (IoIFP(sv) != PerlIO_stdin() && + IoIFP(sv) != PerlIO_stdout() && + IoIFP(sv) != PerlIO_stderr()) + io_close((IO*)sv); Safefree(IoTOP_NAME(sv)); Safefree(IoFMT_NAME(sv)); Safefree(IoBOTTOM_NAME(sv)); - goto freemagic; - case SVt_PVFM: - goto freemagic; + /* 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); - SvPVX(sv)= 0; - goto freemagic; + hv_undef((HV*)sv); + break; case SVt_PVAV: - av_clear((AV*)sv); - SvPVX(sv)= 0; - 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: + case SVt_RV: if (SvROK(sv)) SvREFCNT_dec(SvRV(sv)); - else if (SvPVX(sv)) + else if (SvPVX(sv) && SvLEN(sv)) Safefree(SvPVX(sv)); break; +/* case SVt_NV: - break; case SVt_IV: - break; - case SVt_RV: - SvREFCNT_dec(SvRV(sv)); - break; case SVt_NULL: break; +*/ } switch (SvTYPE(sv)) { @@ -2035,6 +2821,7 @@ register SV *sv; del_XPVIO(SvANY(sv)); break; } + SvFLAGS(sv) &= SVf_BREAK; SvFLAGS(sv) |= SVTYPEMASK; } @@ -2053,13 +2840,15 @@ SV *sv; { if (!sv) return; - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv)) { - if (sv == &sv_undef || sv == &sv_yes || sv == &sv_no) - return; - } + if (SvREADONLY(sv)) { + if (sv == &sv_undef || sv == &sv_yes || sv == &sv_no) + return; } - if (SvREFCNT(sv) == 0 && !(SvFLAGS(sv) & SVf_BREAK)) { + 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; } @@ -2072,14 +2861,15 @@ SV *sv; } #endif sv_clear(sv); - del_SV(sv); + if (! SvREFCNT(sv)) + del_SV(sv); } STRLEN sv_len(sv) register SV *sv; { - char *s; + char *junk; STRLEN len; if (!sv) @@ -2088,7 +2878,7 @@ register SV *sv; if (SvGMAGICAL(sv)) len = mg_len(sv); else - s = SvPV(sv, len); + junk = SvPV(sv, len); return len; } @@ -2117,68 +2907,154 @@ register SV *str2; if (cur1 != cur2) return 0; - return !bcmp(pv1, pv2, cur1); + return memEQ(pv1, pv2, cur1); } I32 -sv_cmp(str1,str2) +sv_cmp(str1, str2) register SV *str1; register SV *str2; { + STRLEN cur1 = 0; + char *pv1 = str1 ? SvPV(str1, cur1) : NULL; + STRLEN cur2 = 0; + char *pv2 = str2 ? SvPV(str2, cur2) : NULL; I32 retval; - char *pv1; - STRLEN cur1; - char *pv2; - STRLEN cur2; - - 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; - 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)) + retval = memcmp((void*)pv1, (void*)pv2, cur1 < cur2 ? cur1 : cur2); + + if (retval) return retval < 0 ? -1 : 1; - else if (cur1 == cur2) + + if (cur1 == cur2) return 0; else - return 1; + return cur1 < cur2 ? -1 : 1; +} + +I32 +sv_cmp_locale(sv1, sv2) +register SV *sv1; +register SV *sv2; +{ +#ifdef USE_LOCALE_COLLATE + + char *pv1, *pv2; + STRLEN len1, len2; + I32 retval; + + if (collation_standard) + goto raw_compare; + + len1 = 0; + pv1 = sv1 ? sv_collxfrm(sv1, &len1) : NULL; + len2 = 0; + pv2 = sv2 ? sv_collxfrm(sv2, &len2) : NULL; + + if (!pv1 || !len1) { + if (pv2 && len2) + return -1; + else + goto raw_compare; + } + else { + if (!pv2 || !len2) + return 1; + } + + retval = memcmp((void*)pv1, (void*)pv2, len1 < len2 ? len1 : len2); + + if (retval) + return retval < 0 ? -1 : 1; + + /* + * When the result of collation is equality, that doesn't mean + * that there are no differences -- some locales exclude some + * characters from consideration. So to avoid false equalities, + * we use the raw string as a tiebreaker. + */ + + raw_compare: + /* FALL THROUGH */ + +#endif /* USE_LOCALE_COLLATE */ + + return sv_cmp(sv1, sv2); +} + +#ifdef USE_LOCALE_COLLATE +/* + * Any scalar variable may carry an 'o' magic that contains the + * scalar data of the variable transformed to such a format that + * a normal memory comparison can be used to compare the data + * according to the locale settings. + */ +char * +sv_collxfrm(sv, nxp) + SV *sv; + STRLEN *nxp; +{ + MAGIC *mg; + + mg = SvMAGICAL(sv) ? mg_find(sv, 'o') : NULL; + if (!mg || !mg->mg_ptr || *(U32*)mg->mg_ptr != collation_ix) { + char *s, *xf; + STRLEN len, xlen; + + if (mg) + Safefree(mg->mg_ptr); + s = SvPV(sv, len); + if ((xf = mem_collxfrm(s, len, &xlen))) { + if (SvREADONLY(sv)) { + SAVEFREEPV(xf); + *nxp = xlen; + return xf; + } + if (! mg) { + sv_magic(sv, 0, 'o', 0, 0); + mg = mg_find(sv, 'o'); + assert(mg); + } + mg->mg_ptr = xf; + mg->mg_len = xlen; + } + else { + if (mg) { + mg->mg_ptr = NULL; + mg->mg_len = -1; + } + } + } + if (mg && mg->mg_ptr) { + *nxp = mg->mg_len; + return mg->mg_ptr + sizeof(collation_ix); + } + else { + *nxp = 0; + return NULL; + } } +#endif /* USE_LOCALE_COLLATE */ + 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 (SvTHINKFIRST(sv)) { if (SvREADONLY(sv) && curcop != &compiling) @@ -2187,19 +3063,67 @@ I32 append; sv_unref(sv); } if (!SvUPGRADE(sv, SVt_PV)) - return; - if (rspara) { /* have to do this both before and after */ + return 0; + SvSCREAM_off(sv); + + 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; @@ -2207,110 +3131,164 @@ I32 append; } else { shortbuffered = 0; - SvGROW(sv, append+cnt+2);/* (remembering cnt can be -1) */ + /* remember that cnt can be negative */ + SvGROW(sv, append + (cnt <= 0 ? 2 : (cnt + 1))); } } 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=%ld, cnt=%ld\n",(long)ptr,(long)cnt)); + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: entering: FILE * thinks ptr=%ld, cnt=%ld, base=%ld\n", + (long)PerlIO_get_ptr(fp), (long)PerlIO_get_cnt(fp), + (long)(PerlIO_has_base(fp) ? PerlIO_get_base(fp) : 0))); 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 { + Copy(ptr, bp, cnt, char); /* 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=%ld, cnt=%ld\n",(long)ptr,(long)cnt)); + PerlIO_set_ptrcnt(fp, ptr, cnt); /* deregisterize cnt and ptr */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: pre: FILE * thinks ptr=%ld, cnt=%ld, base=%ld\n", + (long)PerlIO_get_ptr(fp), (long)PerlIO_get_cnt(fp), + (long)(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); + /* This used to call 'filbuf' in stdio form, but as that behaves like + getc when cnt <= 0 we use PerlIO_getc here to avoid introducing + another abstraction. */ + i = PerlIO_getc(fp); /* get more characters */ + DEBUG_P(PerlIO_printf(Perl_debug_log, + "Screamer: post: FILE * thinks ptr=%ld, cnt=%ld, base=%ld\n", + (long)PerlIO_get_ptr(fp), (long)PerlIO_get_cnt(fp), + (long)(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); + 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=%ld, cnt=%ld\n",(long)ptr,(long)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)) || + memNE((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=%ld, cnt=%ld\n",(long)ptr,(long)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=%ld, cnt=%ld, base=%ld\n", + (long)PerlIO_get_ptr(fp), (long)PerlIO_get_cnt(fp), + (long)(PerlIO_has_base (fp) ? PerlIO_get_base(fp) : 0))); *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),(int)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 || + memNE(SvPVX(sv) + SvCUR(sv) - rslen, rsptr, rslen))) { append = -1; - goto screamer; + /* + * If we're reading from a TTY and we get a short read, + * indicating that the user hit his EOF character, we need + * to notice it now, because if we try to read from the TTY + * again, the EOF condition will disappear. + * + * The comparison of cnt to sizeof(buf) is an optimization + * that prevents unnecessary calls to feof(). + * + * - jik 9/25/96 + */ + if (!(cnt < sizeof(buf) && PerlIO_eof(fp))) + 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; @@ -2323,34 +3301,43 @@ register SV *sv; if (SvTHINKFIRST(sv)) { if (SvREADONLY(sv) && curcop != &compiling) croak(no_modify); - if (SvROK(sv)) - sv_unref(sv); + if (SvROK(sv)) { +#ifdef OVERLOAD + if (SvAMAGIC(sv) && AMG_CALLun(sv,inc)) return; +#endif /* OVERLOAD */ + sv_unref(sv); + } } if (SvGMAGICAL(sv)) mg_get(sv); flags = SvFLAGS(sv); - if (flags & SVp_IOK) { - ++SvIVX(sv); - SvIOK_only(sv); - return; - } if (flags & SVp_NOK) { + (void)SvNOK_only(sv); SvNVX(sv) += 1.0; - SvNOK_only(sv); + return; + } + if (flags & SVp_IOK) { + if (SvIVX(sv) == IV_MAX) + sv_setnv(sv, (double)IV_MAX + 1.0); + else { + (void)SvIOK_only(sv); + ++SvIVX(sv); + } return; } if (!(flags & SVp_POK) || !*SvPVX(sv)) { - if (!SvUPGRADE(sv, SVt_NV)) - return; + 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); while (isALPHA(*d)) d++; while (isDIGIT(*d)) d++; if (*d) { - sv_setnv(sv,atof(SvPVX(sv)) + 1.0); /* punt */ + SET_NUMERIC_STANDARD(); + sv_setnv(sv,atof(SvPVX(sv)) + 1.0); /* punt */ return; } d--; @@ -2389,30 +3376,39 @@ register SV *sv; if (SvTHINKFIRST(sv)) { if (SvREADONLY(sv) && curcop != &compiling) croak(no_modify); - if (SvROK(sv)) - sv_unref(sv); + if (SvROK(sv)) { +#ifdef OVERLOAD + if (SvAMAGIC(sv) && AMG_CALLun(sv,dec)) return; +#endif /* OVERLOAD */ + sv_unref(sv); + } } if (SvGMAGICAL(sv)) mg_get(sv); flags = SvFLAGS(sv); - if (flags & SVp_IOK) { - --SvIVX(sv); - SvIOK_only(sv); - return; - } if (flags & SVp_NOK) { SvNVX(sv) -= 1.0; - SvNOK_only(sv); + (void)SvNOK_only(sv); + return; + } + if (flags & SVp_IOK) { + if (SvIVX(sv) == IV_MIN) + sv_setnv(sv, (double)IV_MIN - 1.0); + else { + (void)SvIOK_only(sv); + --SvIVX(sv); + } return; } if (!(flags & SVp_POK)) { - if (!SvUPGRADE(sv, SVt_NV)) - return; + 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); + SET_NUMERIC_STANDARD(); + sv_setnv(sv,atof(SvPVX(sv)) - 1.0); /* punt */ } /* Make a string that will exist for the duration of the expression @@ -2423,7 +3419,7 @@ register SV *sv; static void sv_mortalgrow() { - tmps_max += 128; + tmps_max += (tmps_max < 512) ? 128 : 512; Renew(tmps_stack, tmps_max, SV*); } @@ -2433,7 +3429,7 @@ SV *oldstr; { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -2450,7 +3446,7 @@ sv_newmortal() { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = SVs_TEMP; @@ -2468,10 +3464,8 @@ register SV *sv; { if (!sv) return sv; - if (SvTHINKFIRST(sv)) { - if (SvREADONLY(sv) && curcop != &compiling) - croak(no_modify); - } + if (SvREADONLY(sv) && curcop != &compiling) + croak(no_modify); if (++tmps_ix >= tmps_max) sv_mortalgrow(); tmps_stack[tmps_ix] = sv; @@ -2486,7 +3480,7 @@ STRLEN len; { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -2496,13 +3490,42 @@ STRLEN len; return sv; } +#ifdef I_STDARG +SV * +newSVpvf(const char* pat, ...) +#else +/*VARARGS0*/ +SV * +newSVpvf(pat, va_alist) +const char *pat; +va_dcl +#endif +{ + register SV *sv; + va_list args; + + new_SV(sv); + SvANY(sv) = 0; + SvREFCNT(sv) = 1; + SvFLAGS(sv) = 0; +#ifdef I_STDARG + va_start(args, pat); +#else + va_start(args); +#endif + sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*)); + va_end(args); + return sv; +} + + SV * newSVnv(n) double n; { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -2512,11 +3535,11 @@ double n; SV * newSViv(i) -I32 i; +IV i; { register SV *sv; - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -2524,6 +3547,36 @@ I32 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; +} + +#ifdef CRIPPLED_CC +SV * +newRV_noinc(ref) +SV *ref; +{ + register SV *sv; + + sv = newRV(ref); + SvREFCNT_dec(ref); + return sv; +} +#endif /* CRIPPLED_CC */ + /* make an exact duplicate of old */ SV * @@ -2538,7 +3591,7 @@ register SV *old; warn("semi-panic: attempt to dup freed string"); return Nullsv; } - new_SV(); + new_SV(sv); SvANY(sv) = 0; SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; @@ -2587,34 +3640,70 @@ 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); if (SvPVX(sv) != Nullch) *SvPVX(sv) = '\0'; + SvTAINT(sv); } if (GvAV(gv)) { av_clear(GvAV(gv)); } - if (GvHV(gv)) { + if (GvHV(gv) && !HvNAME(GvHV(gv))) { hv_clear(GvHV(gv)); +#ifndef VMS /* VMS has no environ array */ if (gv == envgv) environ[0] = Nullch; +#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; +} + CV * sv_2cv(sv, st, gvp, lref) SV *sv; @@ -2628,14 +3717,6 @@ I32 lref; if (!sv) return *gvp = Nullgv, Nullcv; switch (SvTYPE(sv)) { - case SVt_RV: - is_rv: - cv = (CV*)SvRV(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; @@ -2646,29 +3727,44 @@ I32 lref; return Nullcv; case SVt_PVGV: gv = (GV*)sv; + *gvp = gv; *st = GvESTASH(gv); goto fix_gv; default: - if (SvROK(sv)) - goto is_rv; + 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 = NEWSV(0,0); - gv_efullname(sv, gv); - newSUB(savestack_ix, - newSVOP(OP_CONST, 0, sv), + if (lref && !GvCVu(gv)) { + SV *tmpsv; + ENTER; + tmpsv = NEWSV(704,0); + gv_efullname3(tmpsv, gv, Nullch); + newSUB(start_subparse(FALSE, 0), + newSVOP(OP_CONST, 0, tmpsv), + Nullop, Nullop); + LEAVE; + if (!GvCVu(gv)) + croak("Unable to create sub named \"%s\"", SvPV(sv,na)); } - return GvCV(gv); + return GvCVu(gv); } } @@ -2702,19 +3798,40 @@ register SV *sv; } } } -#endif /* SvTRUE */ +#endif /* !SvTRUE */ + +#ifndef SvIV +IV +SvIV(sv) +register SV *sv; +{ + if (SvIOK(sv)) + return SvIVX(sv); + return sv_2iv(sv); +} +#endif /* !SvIV */ + +#ifndef SvUV +UV +SvUV(sv) +register SV *sv; +{ + if (SvIOK(sv)) + return SvUVX(sv); + return sv_2uv(sv); +} +#endif /* !SvUV */ #ifndef SvNV -double SvNV(Sv) -register SV *Sv; +double +SvNV(sv) +register SV *sv; { - if (SvNOK(Sv)) - return SvNVX(Sv); - if (SvIOK(Sv)) - return (double)SvIVX(Sv); - return sv_2nv(Sv); + if (SvNOK(sv)) + return SvNVX(sv); + return sv_2nv(sv); } -#endif /* SvNV */ +#endif /* !SvNV */ #ifdef CRIPPLED_CC char * @@ -2722,17 +3839,119 @@ 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 (!sv) + return 0; + if (SvGMAGICAL(sv)) + mg_get(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 (!sv) + return 0; + if (SvGMAGICAL(sv)) + mg_get(sv); if (!SvROK(sv)) return 0; sv = (SV*)SvRV(sv); @@ -2743,43 +3962,703 @@ char *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(); + new_SV(sv); SvANY(sv) = 0; - SvREFCNT(sv) = 1; + SvREFCNT(sv) = 0; SvFLAGS(sv) = 0; - sv_setnv(sv, (double)(unsigned long)ptr); sv_upgrade(rv, SVt_RV); SvRV(rv) = SvREFCNT_inc(sv); SvROK_on(rv); - ++sv_rvcount; - stash = fetch_stash(newSVpv(name,0), TRUE); - SvOBJECT_on(sv); - SvUPGRADE(sv, SVt_PVMG); - SvSTASH(sv) = (HV*)SvREFCNT_inc(stash); + if (classname) { + HV* stash = gv_stashpv(classname, TRUE); + (void)sv_bless(rv, stash); + } + return 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; +} + +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)) { + if (SvTYPE(ref) != SVt_PVIO) + --sv_objcount; + SvREFCNT_dec(SvSTASH(ref)); + } + } + SvOBJECT_on(ref); + if (SvTYPE(ref) != SVt_PVIO) + ++sv_objcount; + (void)SvUPGRADE(ref, SVt_PVMG); + SvSTASH(ref) = (HV*)SvREFCNT_inc(stash); + +#ifdef OVERLOAD + if (Gv_AMG(stash)) + SvAMAGIC_on(sv); + else + SvAMAGIC_off(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; { - SvREFCNT_dec(SvRV(sv)); + SV* rv = SvRV(sv); + SvRV(sv) = 0; SvROK_off(sv); - --sv_rvcount; + if (SvREFCNT(rv) != 1 || SvREADONLY(rv)) + SvREFCNT_dec(rv); + else + sv_2mortal(rv); /* Schedule for freeing later */ +} + +void +sv_taint(sv) +SV *sv; +{ + sv_magic((sv), Nullsv, 't', Nullch, 0); +} + +void +sv_untaint(sv) +SV *sv; +{ + if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv)) { + MAGIC *mg = mg_find(sv, 't'); + if (mg) + mg->mg_len &= ~1; + } +} + +bool +sv_tainted(sv) +SV *sv; +{ + if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv)) { + MAGIC *mg = mg_find(sv, 't'); + if (mg && ((mg->mg_len & 1) || (mg->mg_len & 2) && mg->mg_obj == sv)) + return TRUE; + } + return FALSE; +} + +#ifdef I_STDARG +void +sv_setpvf(SV *sv, const char* pat, ...) +#else +/*VARARGS0*/ +void +sv_setpvf(sv, pat, va_alist) + SV *sv; + const char *pat; + va_dcl +#endif +{ + va_list args; +#ifdef I_STDARG + va_start(args, pat); +#else + va_start(args); +#endif + sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*)); + va_end(args); +} + +#ifdef I_STDARG +void +sv_catpvf(SV *sv, const char* pat, ...) +#else +/*VARARGS0*/ +void +sv_catpvf(sv, pat, va_alist) + SV *sv; + const char *pat; + va_dcl +#endif +{ + va_list args; +#ifdef I_STDARG + va_start(args, pat); +#else + va_start(args); +#endif + sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*)); + va_end(args); +} + +void +sv_vsetpvfn(sv, pat, patlen, args, svargs, svmax, used_locale) + SV *sv; + const char *pat; + STRLEN patlen; + va_list *args; + SV **svargs; + I32 svmax; + bool *used_locale; +{ + sv_setpvn(sv, "", 0); + sv_vcatpvfn(sv, pat, patlen, args, svargs, svmax, used_locale); +} + +void +sv_vcatpvfn(sv, pat, patlen, args, svargs, svmax, used_locale) + SV *sv; + const char *pat; + STRLEN patlen; + va_list *args; + SV **svargs; + I32 svmax; + bool *used_locale; +{ + char *p; + char *q; + char *patend; + STRLEN origlen; + I32 svix = 0; + static char nullstr[] = "(null)"; + + /* no matter what, this is a string now */ + (void)SvPV_force(sv, origlen); + + /* special-case "", "%s", and "%_" */ + if (patlen == 0) + return; + if (patlen == 2 && pat[0] == '%') { + switch (pat[1]) { + case 's': + if (args) { + char *s = va_arg(*args, char*); + sv_catpv(sv, s ? s : nullstr); + } + else if (svix < svmax) + sv_catsv(sv, *svargs); + return; + case '_': + if (args) { + sv_catsv(sv, va_arg(*args, SV*)); + return; + } + /* See comment on '_' below */ + break; + } + } + + patend = (char*)pat + patlen; + for (p = (char*)pat; p < patend; p = q) { + bool alt = FALSE; + bool left = FALSE; + char fill = ' '; + char plus = 0; + char intsize = 0; + STRLEN width = 0; + STRLEN zeros = 0; + bool has_precis = FALSE; + STRLEN precis = 0; + + char esignbuf[4]; + STRLEN esignlen = 0; + + char *eptr = Nullch; + STRLEN elen = 0; + char ebuf[TYPE_DIGITS(int) * 2 + 16]; /* large enough for "%#.#f" */ + + static char *efloatbuf = Nullch; + static STRLEN efloatsize = 0; + + char c; + int i; + unsigned base; + IV iv; + UV uv; + double nv; + STRLEN have; + STRLEN need; + STRLEN gap; + + for (q = p; q < patend && *q != '%'; ++q) ; + if (q > p) { + sv_catpvn(sv, p, q - p); + p = q; + } + if (q++ >= patend) + break; + + /* FLAGS */ + + while (*q) { + switch (*q) { + case ' ': + case '+': + plus = *q++; + continue; + + case '-': + left = TRUE; + q++; + continue; + + case '0': + fill = *q++; + continue; + + case '#': + alt = TRUE; + q++; + continue; + + default: + break; + } + break; + } + + /* WIDTH */ + + switch (*q) { + case '1': case '2': case '3': + case '4': case '5': case '6': + case '7': case '8': case '9': + width = 0; + while (isDIGIT(*q)) + width = width * 10 + (*q++ - '0'); + break; + + case '*': + if (args) + i = va_arg(*args, int); + else + i = (svix < svmax) ? SvIVx(svargs[svix++]) : 0; + left |= (i < 0); + width = (i < 0) ? -i : i; + q++; + break; + } + + /* PRECISION */ + + if (*q == '.') { + q++; + if (*q == '*') { + if (args) + i = va_arg(*args, int); + else + i = (svix < svmax) ? SvIVx(svargs[svix++]) : 0; + precis = (i < 0) ? 0 : i; + q++; + } + else { + precis = 0; + while (isDIGIT(*q)) + precis = precis * 10 + (*q++ - '0'); + } + has_precis = TRUE; + } + + /* SIZE */ + + switch (*q) { + case 'l': +#if 0 /* when quads have better support within Perl */ + if (*(q + 1) == 'l') { + intsize = 'q'; + q += 2; + break; + } +#endif + /* FALL THROUGH */ + case 'h': + case 'V': + intsize = *q++; + break; + } + + /* CONVERSION */ + + switch (c = *q++) { + + /* STRINGS */ + + case '%': + eptr = q - 1; + elen = 1; + goto string; + + case 'c': + if (args) + c = va_arg(*args, int); + else + c = (svix < svmax) ? SvIVx(svargs[svix++]) : 0; + eptr = &c; + elen = 1; + goto string; + + case 's': + if (args) { + eptr = va_arg(*args, char*); + if (eptr) + elen = strlen(eptr); + else { + eptr = nullstr; + elen = sizeof nullstr - 1; + } + } + else if (svix < svmax) + eptr = SvPVx(svargs[svix++], elen); + goto string; + + case '_': + /* + * The "%_" hack might have to be changed someday, + * if ISO or ANSI decide to use '_' for something. + * So we keep it hidden from users' code. + */ + if (!args) + goto unknown; + eptr = SvPVx(va_arg(*args, SV*), elen); + + string: + if (has_precis && elen > precis) + elen = precis; + break; + + /* INTEGERS */ + + case 'p': + if (args) + uv = (UV)va_arg(*args, void*); + else + uv = (svix < svmax) ? (UV)svargs[svix++] : 0; + base = 16; + goto integer; + + case 'D': + intsize = 'l'; + /* FALL THROUGH */ + case 'd': + case 'i': + if (args) { + switch (intsize) { + case 'h': iv = (short)va_arg(*args, int); break; + default: iv = va_arg(*args, int); break; + case 'l': iv = va_arg(*args, long); break; + case 'V': iv = va_arg(*args, IV); break; + } + } + else { + iv = (svix < svmax) ? SvIVx(svargs[svix++]) : 0; + switch (intsize) { + case 'h': iv = (short)iv; break; + default: iv = (int)iv; break; + case 'l': iv = (long)iv; break; + case 'V': break; + } + } + if (iv >= 0) { + uv = iv; + if (plus) + esignbuf[esignlen++] = plus; + } + else { + uv = -iv; + esignbuf[esignlen++] = '-'; + } + base = 10; + goto integer; + + case 'U': + intsize = 'l'; + /* FALL THROUGH */ + case 'u': + base = 10; + goto uns_integer; + + case 'O': + intsize = 'l'; + /* FALL THROUGH */ + case 'o': + base = 8; + goto uns_integer; + + case 'X': + case 'x': + base = 16; + + uns_integer: + if (args) { + switch (intsize) { + case 'h': uv = (unsigned short)va_arg(*args, unsigned); break; + default: uv = va_arg(*args, unsigned); break; + case 'l': uv = va_arg(*args, unsigned long); break; + case 'V': uv = va_arg(*args, UV); break; + } + } + else { + uv = (svix < svmax) ? SvUVx(svargs[svix++]) : 0; + switch (intsize) { + case 'h': uv = (unsigned short)uv; break; + default: uv = (unsigned)uv; break; + case 'l': uv = (unsigned long)uv; break; + case 'V': break; + } + } + + integer: + eptr = ebuf + sizeof ebuf; + switch (base) { + unsigned dig; + case 16: + p = (c == 'X') ? "0123456789ABCDEF" : "0123456789abcdef"; + do { + dig = uv & 15; + *--eptr = p[dig]; + } while (uv >>= 4); + if (alt) { + esignbuf[esignlen++] = '0'; + esignbuf[esignlen++] = c; /* 'x' or 'X' */ + } + break; + case 8: + do { + dig = uv & 7; + *--eptr = '0' + dig; + } while (uv >>= 3); + if (alt && *eptr != '0') + *--eptr = '0'; + break; + default: /* it had better be ten or less */ + do { + dig = uv % base; + *--eptr = '0' + dig; + } while (uv /= base); + break; + } + elen = (ebuf + sizeof ebuf) - eptr; + if (has_precis && precis > elen) + zeros = precis - elen; + break; + + /* FLOATING POINT */ + + case 'F': + c = 'f'; /* maybe %F isn't supported here */ + /* FALL THROUGH */ + case 'e': case 'E': + case 'f': + case 'g': case 'G': + + /* This is evil, but floating point is even more evil */ + + if (args) + nv = va_arg(*args, double); + else + nv = (svix < svmax) ? SvNVx(svargs[svix++]) : 0.0; + + need = 0; + if (c != 'e' && c != 'E') { + i = PERL_INT_MIN; + (void)frexp(nv, &i); + if (i == PERL_INT_MIN) + die("panic: frexp"); + if (i > 0) + need = BIT_DIGITS(i); + } + need += has_precis ? precis : 6; /* known default */ + if (need < width) + need = width; + + need += 20; /* fudge factor */ + if (efloatsize < need) { + Safefree(efloatbuf); + efloatsize = need + 20; /* more fudge */ + New(906, efloatbuf, efloatsize, char); + } + + eptr = ebuf + sizeof ebuf; + *--eptr = '\0'; + *--eptr = c; + if (has_precis) { + base = precis; + do { *--eptr = '0' + (base % 10); } while (base /= 10); + *--eptr = '.'; + } + if (width) { + base = width; + do { *--eptr = '0' + (base % 10); } while (base /= 10); + } + if (fill == '0') + *--eptr = fill; + if (plus) + *--eptr = plus; + if (alt) + *--eptr = '#'; + *--eptr = '%'; + + (void)sprintf(efloatbuf, eptr, nv); + + eptr = efloatbuf; + elen = strlen(efloatbuf); + +#ifdef LC_NUMERIC + /* + * User-defined locales may include arbitrary characters. + * And, unfortunately, some system may alloc the "C" locale + * to be overridden by a malicious user. + */ + if (used_locale) + *used_locale = TRUE; +#endif /* LC_NUMERIC */ + + break; + + /* SPECIAL */ + + case 'n': + i = SvCUR(sv) - origlen; + if (args) { + switch (intsize) { + case 'h': *(va_arg(*args, short*)) = i; break; + default: *(va_arg(*args, int*)) = i; break; + case 'l': *(va_arg(*args, long*)) = i; break; + case 'V': *(va_arg(*args, IV*)) = i; break; + } + } + else if (svix < svmax) + sv_setuv(svargs[svix++], (UV)i); + continue; /* not "break" */ + + /* UNKNOWN */ + + default: + unknown: + if (!args && dowarn && + (op->op_type == OP_PRTF || op->op_type == OP_SPRINTF)) { + SV *msg = sv_newmortal(); + sv_setpvf(msg, "Invalid conversion in %s: ", + (op->op_type == OP_PRTF) ? "printf" : "sprintf"); + if (c) + sv_catpvf(msg, isPRINT(c) ? "\"%%%c\"" : "\"%%\\%03o\"", + c & 0xFF); + else + sv_catpv(msg, "end of string"); + warn("%_", msg); /* yes, this is reentrant */ + } + /* output mangled stuff */ + eptr = p; + elen = q - p; + break; + } + + have = esignlen + zeros + elen; + need = (have > width ? have : width); + gap = need - have; + + SvGROW(sv, SvLEN(sv) + need); + p = SvEND(sv); + if (esignlen && fill == '0') { + for (i = 0; i < esignlen; i++) + *p++ = esignbuf[i]; + } + if (gap && !left) { + memset(p, fill, gap); + p += gap; + } + if (esignlen && fill != '0') { + for (i = 0; i < esignlen; i++) + *p++ = esignbuf[i]; + } + if (zeros) { + for (i = zeros; i; i--) + *p++ = '0'; + } + if (elen) { + memcpy(p, eptr, elen); + p += elen; + } + if (gap && left) { + memset(p, ' ', gap); + p += gap; + } + *p = '\0'; + SvCUR(sv) = p - SvPVX(sv); + } } #ifdef DEBUGGING @@ -2787,111 +4666,145 @@ void sv_dump(sv) SV* sv; { - char tmpbuf[1024]; - char *d = tmpbuf; + SV *d = sv_newmortal(); + char *s; U32 flags; U32 type; if (!sv) { - fprintf(stderr, "SV = 0\n"); + 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_OK) strcat(d, "OK,"); - if (flags & SVf_OOK) strcat(d, "OOK,"); - if (flags & SVf_READONLY) strcat(d, "READONLY,"); - d += strlen(d); - - 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,"); - d += strlen(d); - if (d[-1] == ',') - d--; - *d++ = ')'; - *d = '\0'; + sv_setpvf(d, "(0x%lx)\n REFCNT = %ld\n FLAGS = (", + (unsigned long)SvANY(sv), (long)SvREFCNT(sv)); + if (flags & SVs_PADBUSY) sv_catpv(d, "PADBUSY,"); + if (flags & SVs_PADTMP) sv_catpv(d, "PADTMP,"); + if (flags & SVs_PADMY) sv_catpv(d, "PADMY,"); + if (flags & SVs_TEMP) sv_catpv(d, "TEMP,"); + if (flags & SVs_OBJECT) sv_catpv(d, "OBJECT,"); + if (flags & SVs_GMG) sv_catpv(d, "GMG,"); + if (flags & SVs_SMG) sv_catpv(d, "SMG,"); + if (flags & SVs_RMG) sv_catpv(d, "RMG,"); + + if (flags & SVf_IOK) sv_catpv(d, "IOK,"); + if (flags & SVf_NOK) sv_catpv(d, "NOK,"); + if (flags & SVf_POK) sv_catpv(d, "POK,"); + if (flags & SVf_ROK) sv_catpv(d, "ROK,"); + if (flags & SVf_OOK) sv_catpv(d, "OOK,"); + if (flags & SVf_FAKE) sv_catpv(d, "FAKE,"); + if (flags & SVf_READONLY) sv_catpv(d, "READONLY,"); + +#ifdef OVERLOAD + if (flags & SVf_AMAGIC) sv_catpv(d, "OVERLOAD,"); +#endif /* OVERLOAD */ + if (flags & SVp_IOK) sv_catpv(d, "pIOK,"); + if (flags & SVp_NOK) sv_catpv(d, "pNOK,"); + if (flags & SVp_POK) sv_catpv(d, "pPOK,"); + if (flags & SVp_SCREAM) sv_catpv(d, "SCREAM,"); - fprintf(stderr, "SV = "); + switch (type) { + case SVt_PVCV: + case SVt_PVFM: + if (CvANON(sv)) sv_catpv(d, "ANON,"); + if (CvUNIQUE(sv)) sv_catpv(d, "UNIQUE,"); + if (CvCLONE(sv)) sv_catpv(d, "CLONE,"); + if (CvCLONED(sv)) sv_catpv(d, "CLONED,"); + if (CvNODEBUG(sv)) sv_catpv(d, "NODEBUG,"); + break; + case SVt_PVHV: + if (HvSHAREKEYS(sv)) sv_catpv(d, "SHAREKEYS,"); + if (HvLAZYDEL(sv)) sv_catpv(d, "LAZYDEL,"); + break; + case SVt_PVGV: + if (GvINTRO(sv)) sv_catpv(d, "INTRO,"); + if (GvMULTI(sv)) sv_catpv(d, "MULTI,"); + if (GvASSUMECV(sv)) sv_catpv(d, "ASSUMECV,"); + if (GvIMPORTED(sv)) { + sv_catpv(d, "IMPORT"); + if (GvIMPORTED(sv) == GVf_IMPORTED) + sv_catpv(d, "ALL,"); + else { + sv_catpv(d, "("); + if (GvIMPORTED_SV(sv)) sv_catpv(d, " SV"); + if (GvIMPORTED_AV(sv)) sv_catpv(d, " AV"); + if (GvIMPORTED_HV(sv)) sv_catpv(d, " HV"); + if (GvIMPORTED_CV(sv)) sv_catpv(d, " CV"); + sv_catpv(d, " ),"); + } + } + } + + if (*(SvEND(d) - 1) == ',') + SvPVX(d)[--SvCUR(d)] = '\0'; + sv_catpv(d, ")"); + s = SvPVX(d); + + PerlIO_printf(Perl_debug_log, "SV = "); switch (type) { case SVt_NULL: - fprintf(stderr,"NULL%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "NULL%s\n", s); return; case SVt_IV: - fprintf(stderr,"IV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "IV%s\n", s); break; case SVt_NV: - fprintf(stderr,"NV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "NV%s\n", s); break; case SVt_RV: - fprintf(stderr,"RV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "RV%s\n", s); break; case SVt_PV: - fprintf(stderr,"PV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PV%s\n", s); break; case SVt_PVIV: - fprintf(stderr,"PVIV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVIV%s\n", s); break; case SVt_PVNV: - fprintf(stderr,"PVNV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVNV%s\n", s); break; case SVt_PVBM: - fprintf(stderr,"PVBM%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVBM%s\n", s); break; case SVt_PVMG: - fprintf(stderr,"PVMG%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVMG%s\n", s); break; case SVt_PVLV: - fprintf(stderr,"PVLV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVLV%s\n", s); break; case SVt_PVAV: - fprintf(stderr,"PVAV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVAV%s\n", s); break; case SVt_PVHV: - fprintf(stderr,"PVHV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVHV%s\n", s); break; case SVt_PVCV: - fprintf(stderr,"PVCV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVCV%s\n", s); break; case SVt_PVGV: - fprintf(stderr,"PVGV%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVGV%s\n", s); break; case SVt_PVFM: - fprintf(stderr,"PVFM%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVFM%s\n", s); break; case SVt_PVIO: - fprintf(stderr,"PVIO%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "PVIO%s\n", s); break; default: - fprintf(stderr,"UNKNOWN%s\n", tmpbuf); + PerlIO_printf(Perl_debug_log, "UNKNOWN%s\n", s); return; } if (type >= SVt_PVIV || type == SVt_IV) - fprintf(stderr, " IV = %ld\n", (long)SvIVX(sv)); - if (type >= SVt_PVNV || type == SVt_NV) - fprintf(stderr, " NV = %.20g\n", SvNVX(sv)); + PerlIO_printf(Perl_debug_log, " IV = %ld\n", (long)SvIVX(sv)); + if (type >= SVt_PVNV || type == SVt_NV) { + SET_NUMERIC_STANDARD(); + PerlIO_printf(Perl_debug_log, " NV = %.*g\n", DBL_DIG, SvNVX(sv)); + } if (SvROK(sv)) { - fprintf(stderr, " RV = 0x%lx\n", SvRV(sv)); + PerlIO_printf(Perl_debug_log, " RV = 0x%lx\n", (long)SvRV(sv)); sv_dump(SvRV(sv)); return; } @@ -2899,100 +4812,117 @@ SV* sv; return; if (type <= SVt_PVLV) { if (SvPVX(sv)) - fprintf(stderr, " PV = 0x%lx \"%s\"\n CUR = %ld\n LEN = %ld\n", - SvPVX(sv), SvPVX(sv), (long)SvCUR(sv), (long)SvLEN(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 - fprintf(stderr, " PV = 0\n"); + PerlIO_printf(Perl_debug_log, " PV = 0\n"); } if (type >= SVt_PVMG) { if (SvMAGIC(sv)) { - fprintf(stderr, " MAGIC = 0x%lx\n", SvMAGIC(sv)); + PerlIO_printf(Perl_debug_log, " MAGIC = 0x%lx\n", (long)SvMAGIC(sv)); } if (SvSTASH(sv)) - fprintf(stderr, " STASH = %s\n", HvNAME(SvSTASH(sv))); + PerlIO_printf(Perl_debug_log, " STASH = \"%s\"\n", HvNAME(SvSTASH(sv))); } switch (type) { case SVt_PVLV: - fprintf(stderr, " TYPE = %c\n", LvTYPE(sv)); - fprintf(stderr, " TARGOFF = %ld\n", (long)LvTARGOFF(sv)); - fprintf(stderr, " TARGLEN = %ld\n", (long)LvTARGLEN(sv)); - fprintf(stderr, " TARG = 0x%lx\n", LvTARG(sv)); + 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: - fprintf(stderr, " ARRAY = 0x%lx\n", AvARRAY(sv)); - fprintf(stderr, " ALLOC = 0x%lx\n", AvALLOC(sv)); - fprintf(stderr, " FILL = %ld\n", (long)AvFILL(sv)); - fprintf(stderr, " MAX = %ld\n", (long)AvMAX(sv)); - fprintf(stderr, " ARYLEN = 0x%lx\n", AvARYLEN(sv)); - if (AvREAL(sv)) - fprintf(stderr, " FLAGS = (REAL)\n"); - else - fprintf(stderr, " FLAGS = ()\n"); + 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); + sv_setpv(d, ""); + if (flags & AVf_REAL) sv_catpv(d, ",REAL"); + if (flags & AVf_REIFY) sv_catpv(d, ",REIFY"); + if (flags & AVf_REUSED) sv_catpv(d, ",REUSED"); + PerlIO_printf(Perl_debug_log, " FLAGS = (%s)\n", + SvCUR(d) ? SvPVX(d) + 1 : ""); break; case SVt_PVHV: - fprintf(stderr, " ARRAY = 0x%lx\n", HvARRAY(sv)); - fprintf(stderr, " KEYS = %ld\n", (long)HvKEYS(sv)); - fprintf(stderr, " FILL = %ld\n", (long)HvFILL(sv)); - fprintf(stderr, " MAX = %ld\n", (long)HvMAX(sv)); - fprintf(stderr, " RITER = %ld\n", (long)HvRITER(sv)); - fprintf(stderr, " EITER = 0x%lx\n", HvEITER(sv)); + 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)) - fprintf(stderr, " PMROOT = 0x%lx\n", HvPMROOT(sv)); + PerlIO_printf(Perl_debug_log, " PMROOT = 0x%lx\n",(long)HvPMROOT(sv)); if (HvNAME(sv)) - fprintf(stderr, " NAME = \"%s\"\n", HvNAME(sv)); + PerlIO_printf(Perl_debug_log, " NAME = \"%s\"\n", HvNAME(sv)); break; - case SVt_PVFM: case SVt_PVCV: - fprintf(stderr, " STASH = 0x%lx\n", CvSTASH(sv)); - fprintf(stderr, " START = 0x%lx\n", CvSTART(sv)); - fprintf(stderr, " ROOT = 0x%lx\n", CvROOT(sv)); - fprintf(stderr, " USERSUB = 0x%lx\n", CvUSERSUB(sv)); - fprintf(stderr, " USERINDEX = %ld\n", (long)CvUSERINDEX(sv)); - fprintf(stderr, " FILEGV = 0x%lx\n", CvFILEGV(sv)); - fprintf(stderr, " DEPTH = %ld\n", (long)CvDEPTH(sv)); - fprintf(stderr, " PADLIST = 0x%lx\n", CvPADLIST(sv)); - fprintf(stderr, " DELETED = %ld\n", (long)CvDELETED(sv)); + if (SvPOK(sv)) + PerlIO_printf(Perl_debug_log, " PROTOTYPE = \"%s\"\n", SvPV(sv,na)); + /* FALL THROUGH */ + case SVt_PVFM: + 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) - fprintf(stderr, " LINES = %ld\n", (long)FmLINES(sv)); + PerlIO_printf(Perl_debug_log, " LINES = %ld\n", (long)FmLINES(sv)); break; case SVt_PVGV: - fprintf(stderr, " NAME = %s\n", GvNAME(sv)); - fprintf(stderr, " NAMELEN = %ld\n", (long)GvNAMELEN(sv)); - fprintf(stderr, " STASH = 0x%lx\n", GvSTASH(sv)); - fprintf(stderr, " GP = 0x%lx\n", GvGP(sv)); - fprintf(stderr, " SV = 0x%lx\n", GvSV(sv)); - fprintf(stderr, " REFCNT = %ld\n", (long)GvREFCNT(sv)); - fprintf(stderr, " IO = 0x%lx\n", GvIO(sv)); - fprintf(stderr, " FORM = 0x%lx\n", GvFORM(sv)); - fprintf(stderr, " AV = 0x%lx\n", GvAV(sv)); - fprintf(stderr, " HV = 0x%lx\n", GvHV(sv)); - fprintf(stderr, " CV = 0x%lx\n", GvCV(sv)); - fprintf(stderr, " CVGEN = 0x%lx\n", GvCVGEN(sv)); - fprintf(stderr, " LASTEXPR = %ld\n", (long)GvLASTEXPR(sv)); - fprintf(stderr, " LINE = %ld\n", (long)GvLINE(sv)); - fprintf(stderr, " FLAGS = 0x%x\n", (int)GvFLAGS(sv)); - fprintf(stderr, " STASH = 0x%lx\n", GvSTASH(sv)); - fprintf(stderr, " EGV = 0x%lx\n", GvEGV(sv)); + 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, " FILEGV = 0x%lx\n", (long)GvFILEGV(sv)); + PerlIO_printf(Perl_debug_log, " EGV = 0x%lx\n", (long)GvEGV(sv)); break; case SVt_PVIO: - fprintf(stderr, " IFP = 0x%lx\n", IoIFP(sv)); - fprintf(stderr, " OFP = 0x%lx\n", IoOFP(sv)); - fprintf(stderr, " DIRP = 0x%lx\n", IoDIRP(sv)); - fprintf(stderr, " LINES = %ld\n", (long)IoLINES(sv)); - fprintf(stderr, " PAGE = %ld\n", (long)IoPAGE(sv)); - fprintf(stderr, " PAGE_LEN = %ld\n", (long)IoPAGE_LEN(sv)); - fprintf(stderr, " LINES_LEFT = %ld\n", (long)IoLINES_LEFT(sv)); - fprintf(stderr, " TOP_NAME = %s\n", IoTOP_NAME(sv)); - fprintf(stderr, " TOP_GV = 0x%lx\n", IoTOP_GV(sv)); - fprintf(stderr, " FMT_NAME = %s\n", IoFMT_NAME(sv)); - fprintf(stderr, " FMT_GV = 0x%lx\n", IoFMT_GV(sv)); - fprintf(stderr, " BOTTOM_NAME = %s\n", IoBOTTOM_NAME(sv)); - fprintf(stderr, " BOTTOM_GV = 0x%lx\n", IoBOTTOM_GV(sv)); - fprintf(stderr, " SUBPROCESS = %ld\n", (long)IoSUBPROCESS(sv)); - fprintf(stderr, " TYPE = %c\n", IoTYPE(sv)); - fprintf(stderr, " FLAGS = 0x%lx\n", IoFLAGS(sv)); + 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