X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=bbea5dddd3a2855368c0f110b6df65560b17e279;hb=53d8b1b83d50124b4c90921bb6086ec256ae063a;hp=eff0336d5187d4d1ee899ef446a9b180f8af4950;hpb=cf829ab07ccc67cf02ca41d6f870136b64d83833;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.h b/perl.h index eff0336..bbea5dd 100644 --- a/perl.h +++ b/perl.h @@ -1,6 +1,6 @@ /* perl.h * - * Copyright (c) 1987-2000, Larry Wall + * Copyright (c) 1987-2001, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -11,9 +11,9 @@ #ifdef PERL_FOR_X2P /* - * This file is being used for x2p stuff. + * This file is being used for x2p stuff. * Above symbol is defined via -D in 'x2p/Makefile.SH' - * Decouple x2p stuff from some of perls more extreme eccentricities. + * Decouple x2p stuff from some of perls more extreme eccentricities. */ #undef MULTIPLICITY #undef USE_STDIO @@ -21,7 +21,7 @@ #endif /* PERL_FOR_X2P */ #define VOIDUSED 1 -#ifdef PERL_MICRO +#ifdef PERL_MICRO # include "uconfig.h" #else # include "config.h" @@ -183,7 +183,7 @@ class CPerlObj; struct perl_thread; # define pTHX register struct perl_thread *thr # define aTHX thr -# define dTHR dNOOP +# define dTHR dNOOP /* only backward compatibility */ # define dTHXa(a) pTHX = (struct perl_thread*)a # else # ifndef MULTIPLICITY @@ -266,8 +266,8 @@ struct perl_thread; # define END_EXTERN_C } # define EXTERN_C extern "C" #else -# define START_EXTERN_C -# define END_EXTERN_C +# define START_EXTERN_C +# define END_EXTERN_C # define EXTERN_C extern #endif @@ -303,7 +303,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); #endif #define WITH_THX(s) STMT_START { dTHX; s; } STMT_END -#define WITH_THR(s) STMT_START { dTHR; s; } STMT_END +#define WITH_THR(s) WITH_THX(s) /* * SOFT_CAST can be used for args to prototyped functions to retain some @@ -367,7 +367,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); #define TAINT_ENV() if (PL_tainting) { taint_env(); } #define TAINT_PROPER(s) if (PL_tainting) { taint_proper(Nullch, s); } -/* XXX All process group stuff is handled in pp_sys.c. Should these +/* XXX All process group stuff is handled in pp_sys.c. Should these defines move there? If so, I could simplify this a lot. --AD 9/96. */ /* Process group stuff changed from traditional BSD to POSIX. @@ -407,7 +407,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # define HAS_GETPGRP /* Well, effectively it does . . . */ #endif -/* These are not exact synonyms, since setpgrp() and getpgrp() may +/* These are not exact synonyms, since setpgrp() and getpgrp() may have different behaviors, but perl.h used to define USE_BSDPGRP (prior to 5.003_05) so some extension might depend on it. */ @@ -714,6 +714,10 @@ typedef struct perl_mstats perl_mstats_t; #include +#if defined(WIN32) && (defined(PERL_OBJECT) || defined(PERL_IMPLICIT_SYS) || defined(PERL_CAPI)) +# define WIN32SCK_IS_STDSCK /* don't pull in custom wsock layer */ +#endif + #if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */ # include # if defined(USE_SOCKS) && defined(I_SOCKS) @@ -737,7 +741,7 @@ typedef struct perl_mstats perl_mstats_t; # undef INCLUDE_PROTOTYPES # undef PERL_SOCKS_NEED_PROTOTYPES # endif -# endif +# endif # ifdef I_NETDB # include # endif @@ -985,15 +989,15 @@ typedef struct perl_mstats perl_mstats_t; #ifndef S_IRWXU # define S_IRWXU (S_IRUSR|S_IWUSR|S_IXUSR) -#endif +#endif #ifndef S_IRWXG # define S_IRWXG (S_IRGRP|S_IWGRP|S_IXGRP) -#endif +#endif #ifndef S_IRWXO # define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH) -#endif +#endif #ifndef S_IREAD # define S_IREAD S_IRUSR @@ -1080,7 +1084,11 @@ typedef UVTYPE UV; #define IV_DIG (BIT_DIGITS(IVSIZE * 8)) #define UV_DIG (BIT_DIGITS(UVSIZE * 8)) -/* +#ifndef NO_PERL_PRESERVE_IVUV +#define PERL_PRESERVE_IVUV /* We like our integers to stay integers. */ +#endif + +/* * The macros INT2PTR and NUM2PTR are (despite their names) * bi-directional: they will convert int/float to or from pointers. * However the conversion to int/float are named explicitly: @@ -1094,7 +1102,7 @@ typedef UVTYPE UV; # define PTRV UV # define INT2PTR(any,d) (any)(d) #else -# if PTRSIZE == LONGSIZE +# if PTRSIZE == LONGSIZE # define PTRV unsigned long # else # define PTRV unsigned @@ -1105,12 +1113,12 @@ typedef UVTYPE UV; #define PTR2IV(p) INT2PTR(IV,p) #define PTR2UV(p) INT2PTR(UV,p) #define PTR2NV(p) NUM2PTR(NV,p) -#if PTRSIZE == LONGSIZE +#if PTRSIZE == LONGSIZE # define PTR2ul(p) (unsigned long)(p) #else # define PTR2ul(p) INT2PTR(unsigned long,p) #endif - + #ifdef USE_LONG_DOUBLE # if defined(HAS_LONG_DOUBLE) && LONG_DOUBLESIZE == DOUBLESIZE # define LONG_DOUBLE_EQUALS_DOUBLE @@ -1273,7 +1281,7 @@ typedef NVTYPE NV; #endif #if !defined(Perl_atof) && defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) -# if !defined(Perl_atof) && defined(HAS_STRTOLD) +# if !defined(Perl_atof) && defined(HAS_STRTOLD) # define Perl_atof(s) (NV)strtold(s, (char**)NULL) # endif # if !defined(Perl_atof) && defined(HAS_ATOLF) @@ -1291,7 +1299,7 @@ typedef NVTYPE NV; # define Perl_atof2(s,f) ((f) = (NV)Perl_atof(s)) #endif -/* Previously these definitions used hardcoded figures. +/* Previously these definitions used hardcoded figures. * It is hoped these formula are more portable, although * no data one way or another is presently known to me. * The "PERL_" names are used because these calculated constants @@ -1342,7 +1350,7 @@ typedef NVTYPE NV; # define PERL_UCHAR_MAX ((unsigned char)~(unsigned)0) # endif #endif - + /* * CHAR_MIN and CHAR_MAX are not included here, as the (char) type may be * ambiguous. It may be equivalent to (signed char) or (unsigned char) @@ -1549,7 +1557,7 @@ typedef struct ptr_tbl PTR_TBL_t; # define FSEEKSIZE LSEEKSIZE # else # define FSEEKSIZE LONGSIZE -# endif +# endif #endif #if defined(USE_LARGE_FILES) && !defined(NO_64_BIT_STDIO) @@ -1710,7 +1718,7 @@ typedef struct ptr_tbl PTR_TBL_t; # endif #endif -/* +/* * USE_THREADS needs to be after unixish.h as includes * which defines NSIG - which will stop inclusion of * this results in many functions being undeclared which bothers C++ @@ -1869,7 +1877,7 @@ typedef pthread_key_t perl_key; # define SVf "p" # else # define SVf "_" -# endif +# endif #endif #ifndef UVf @@ -1877,7 +1885,7 @@ typedef pthread_key_t perl_key; # define UVf UVuf # else # define UVf "Vu" -# endif +# endif #endif #ifndef VDf @@ -1885,7 +1893,7 @@ typedef pthread_key_t perl_key; # define VDf "p" # else # define VDf "vd" -# endif +# endif #endif /* Some unistd.h's give a prototype for pause() even though @@ -2149,6 +2157,7 @@ Gid_t getegid (void); # else # define DEBUG_S(a) # endif +#define DEBUG_T(a) if (PL_debug & (1<<17)) a #else #define DEB(a) #define DEBUG(a) @@ -2169,6 +2178,7 @@ Gid_t getegid (void); #define DEBUG_X(a) #define DEBUG_D(a) #define DEBUG_S(a) +#define DEBUG_T(a) #endif #define YYMAXDEPTH 300 @@ -2341,7 +2351,7 @@ EXT char *** environ_pointer; # if !defined(DONT_DECLARE_STD) || \ (defined(__svr4__) && defined(__GNUC__) && defined(sun)) || \ defined(__sgi) || \ - defined(__DGUX) + defined(__DGUX) extern char ** environ; /* environment variables supplied via exec */ # endif # endif @@ -2687,6 +2697,7 @@ enum { /* pass one of these to get_vtbl */ #define HINT_FILETEST_ACCESS 0x00400000 #define HINT_UTF8 0x00800000 +#define HINT_UTF8_DISTINCT 0x01000000 /* Various states of an input record separator SV (rs, nrs) */ #define RsSNARF(sv) (! SvOK(sv)) @@ -2745,9 +2756,9 @@ struct perl_vars *PL_VarsPtr; #endif /* PERL_GLOBAL_STRUCT */ #if defined(MULTIPLICITY) || defined(PERL_OBJECT) -/* If we have multiple interpreters define a struct +/* If we have multiple interpreters define a struct holding variables which must be per-interpreter - If we don't have threads anything that would have + If we don't have threads anything that would have be per-thread is per-interpreter. */ @@ -2796,7 +2807,7 @@ typedef void *Thread; #ifndef PERL_CALLCONV # define PERL_CALLCONV -#endif +#endif #ifndef NEXT30_NO_ATTRIBUTE # ifndef HASATTRIBUTE /* disable GNU-cc attribute checking? */ @@ -2833,11 +2844,11 @@ typedef void *Thread; # include "embedvar.h" #endif -/* Now include all the 'global' variables +/* Now include all the 'global' variables * If we don't have threads or multiple interpreters - * these include variables that would have been their struct-s + * these include variables that would have been their struct-s */ - + #define PERLVAR(var,type) EXT type PL_##var; #define PERLVARA(var,n,type) EXT type PL_##var[n]; #define PERLVARI(var,type,init) EXT type PL_##var INIT(init); @@ -2972,6 +2983,9 @@ EXT MGVTBL PL_vtbl_amagicelem = {0, MEMBER_TO_FPTR(Perl_magic_setamagic), EXT MGVTBL PL_vtbl_backref = {0, 0, 0, 0, MEMBER_TO_FPTR(Perl_magic_killbackrefs)}; +EXT MGVTBL PL_vtbl_ovrld = {0, 0, + 0, 0, MEMBER_TO_FPTR(Perl_magic_freeovrld)}; + #else /* !DOINIT */ EXT MGVTBL PL_vtbl_sv; @@ -2995,6 +3009,7 @@ EXT MGVTBL PL_vtbl_pos; EXT MGVTBL PL_vtbl_bm; EXT MGVTBL PL_vtbl_fm; EXT MGVTBL PL_vtbl_uvar; +EXT MGVTBL PL_vtbl_ovrld; #ifdef USE_THREADS EXT MGVTBL PL_vtbl_mutex; @@ -3048,47 +3063,54 @@ enum { copy_amg, neg_amg, to_sv_amg, to_av_amg, to_hv_amg, to_gv_amg, - to_cv_amg, iter_amg, - max_amg_code + to_cv_amg, iter_amg, + DESTROY_amg, max_amg_code /* Do not leave a trailing comma here. C9X allows it, C89 doesn't. */ }; #define NofAMmeth max_amg_code +#define AMG_id2name(id) ((char*)PL_AMG_names[id]+1) #ifdef DOINIT EXTCONST char * PL_AMG_names[NofAMmeth] = { - "fallback", "abs", /* "fallback" should be the first. */ - "bool", "nomethod", - "\"\"", "0+", - "+", "+=", - "-", "-=", - "*", "*=", - "/", "/=", - "%", "%=", - "**", "**=", - "<<", "<<=", - ">>", ">>=", - "&", "&=", - "|", "|=", - "^", "^=", - "<", "<=", - ">", ">=", - "==", "!=", - "<=>", "cmp", - "lt", "le", - "gt", "ge", - "eq", "ne", - "!", "~", - "++", "--", - "atan2", "cos", - "sin", "exp", - "log", "sqrt", - "x", "x=", - ".", ".=", - "=", "neg", - "${}", "@{}", - "%{}", "*{}", - "&{}", "<>", + /* Names kept in the symbol table. fallback => "()", the rest has + "(" prepended. The only other place in perl which knows about + this convention is AMG_id2name (used for debugging output and + 'nomethod' only), the only other place which has it hardwired is + overload.pm. */ + "()", "(abs", /* "fallback" should be the first. */ + "(bool", "(nomethod", + "(\"\"", "(0+", + "(+", "(+=", + "(-", "(-=", + "(*", "(*=", + "(/", "(/=", + "(%", "(%=", + "(**", "(**=", + "(<<", "(<<=", + "(>>", "(>>=", + "(&", "(&=", + "(|", "(|=", + "(^", "(^=", + "(<", "(<=", + "(>", "(>=", + "(==", "(!=", + "(<=>", "(cmp", + "(lt", "(le", + "(gt", "(ge", + "(eq", "(ne", + "(!", "(~", + "(++", "(--", + "(atan2", "(cos", + "(sin", "(exp", + "(log", "(sqrt", + "(x", "(x=", + "(.", "(.=", + "(=", "(neg", + "(${}", "(@{}", + "(%{}", "(*{}", + "(&{}", "(<>", + "DESTROY", }; #else EXTCONST char * PL_AMG_names[NofAMmeth]; @@ -3116,10 +3138,15 @@ typedef struct am_table_short AMTS; #define AMGfallYES 3 #define AMTf_AMAGIC 1 +#define AMTf_OVERLOADED 2 #define AMT_AMAGIC(amt) ((amt)->flags & AMTf_AMAGIC) #define AMT_AMAGIC_on(amt) ((amt)->flags |= AMTf_AMAGIC) #define AMT_AMAGIC_off(amt) ((amt)->flags &= ~AMTf_AMAGIC) +#define AMT_OVERLOADED(amt) ((amt)->flags & AMTf_OVERLOADED) +#define AMT_OVERLOADED_on(amt) ((amt)->flags |= AMTf_OVERLOADED) +#define AMT_OVERLOADED_off(amt) ((amt)->flags &= ~AMTf_OVERLOADED) +#define StashHANDLER(stash,meth) gv_handler((stash),CAT2(meth,_amg)) /* * some compilers like to redefine cos et alia as faster @@ -3229,6 +3256,9 @@ typedef struct am_table_short AMTS; # if !defined(Strtol) && defined(HAS_STRTOLL) # define Strtol strtoll # endif +# if !defined(Strtol) && defined(HAS_STRTOQ) +# define Strtol strtoq +# endif /* is there atoq() anywhere? */ #endif #if !defined(Strtol) && defined(HAS_STRTOL) @@ -3265,9 +3295,9 @@ typedef struct am_table_short AMTS; #endif #if !defined(PERLIO_IS_STDIO) && defined(HASATTRIBUTE) -/* - * Now we have __attribute__ out of the way - * Remap printf +/* + * Now we have __attribute__ out of the way + * Remap printf */ #undef printf #define printf PerlIO_stdoutf @@ -3308,6 +3338,11 @@ typedef struct am_table_short AMTS; * Keep this check simple, or it may slow down execution * massively. */ + +#ifndef PERL_OLD_SIGNALS +#define PERL_ASYNC_CHECK() if (PL_sig_pending) despatch_signals() +#endif + #ifndef PERL_ASYNC_CHECK #define PERL_ASYNC_CHECK() NOOP #endif @@ -3440,13 +3475,17 @@ typedef struct am_table_short AMTS; # include /* setproctitle() in some FreeBSDs */ #endif +#ifndef EXEC_ARGV_CAST +#define EXEC_ARGV_CAST(x) x +#endif + /* and finally... */ #define PERL_PATCHLEVEL_H_IMPLICIT #include "patchlevel.h" #undef PERL_PATCHLEVEL_H_IMPLICIT /* Mention - + NV_PRESERVES_UV HAS_ICONV