X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=9dd71e5a00c8f5c6d1933b2df650892f84d704fb;hb=104d25b722892cb36f4c988c17016ee0180c3b1a;hp=b5fea5cfb48be65297c738177b7060b1f18bf9b0;hpb=6f71a643a0006dd0b3fa05e7dee38659a8cc1041;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.h b/perl.h index b5fea5c..9dd71e5 100644 --- a/perl.h +++ b/perl.h @@ -16,9 +16,6 @@ * Above symbol is defined via -D in 'x2p/Makefile.SH' * Decouple x2p stuff from some of perls more extreme eccentricities. */ -#undef EMBED -#undef NO_EMBED -#define NO_EMBED #undef MULTIPLICITY #undef USE_STDIO #define USE_STDIO @@ -61,9 +58,9 @@ PERL CORE variables or functions needed are made member functions 3. all writable static variables are made member variables 4. all global variables and functions are defined as: - #define var CPerlObj::Perl_var + #define var CPerlObj::PL_var #define func CPerlObj::Perl_func - * these are in objpp.h + * these are in embed.h This necessitated renaming some local variables and functions that had the same name as a global variable or function. This was probably a _good_ thing anyway. @@ -73,7 +70,7 @@ EXTENSIONS 1. Access to global variables and perl functions is through a pointer to the PERL_OBJECT. This pointer type is CPerlObj*. This is made transparent to extension developers by the following macros: - #define var pPerl->Perl_var + #define var pPerl->PL_var #define func pPerl->Perl_func * these are done in objXSUB.h This requires that the extension be compiled as C++, which means @@ -127,7 +124,7 @@ class CPerlObj; #define PERL_OBJECT_THIS #define _PERL_OBJECT_THIS #define PERL_OBJECT_THIS_ -#define CALLRUNOPS PL_runops +#define CALLRUNOPS (*PL_runops) #define CALLREGCOMP (*PL_regcompp) #define CALLREGEXEC (*PL_regexecp) @@ -136,7 +133,9 @@ class CPerlObj; #define VOIDUSED 1 #include "config.h" -#include "embed.h" +#if !defined(PERL_FOR_X2P) +# include "embed.h" +#endif #undef START_EXTERN_C #undef END_EXTERN_C @@ -155,11 +154,7 @@ class CPerlObj; # ifdef __GNUC__ # define stringify_immed(s) #s # define stringify(s) stringify_immed(s) -#ifdef EMBED register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); -#else -register struct op *op asm(stringify(OP_IN_REGISTER)); -#endif # endif #endif @@ -250,7 +245,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); #define TAINT_NOT (PL_tainted = FALSE) #define TAINT_IF(c) if (c) { PL_tainted = TRUE; } #define TAINT_ENV() if (PL_tainting) { taint_env(); } -#define TAINT_PROPER(s) if (PL_tainting) { taint_proper(no_security, s); } +#define TAINT_PROPER(s) if (PL_tainting) { taint_proper(Nullch, s); } /* 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. @@ -309,12 +304,6 @@ register struct op *op asm(stringify(OP_IN_REGISTER)); # include #endif -/* HP-UX 10.X CMA (Common Multithreaded Architecure) insists that - pthread.h must be included before all other header files. -*/ -#if defined(USE_THREADS) && defined(PTHREAD_H_FIRST) -# include -#endif #ifndef _TYPES_ /* If types.h defines this it's easy. */ # ifndef major /* Does everyone's types.h define this? */ # include @@ -863,37 +852,70 @@ Free_t Perl_free _((Malloc_t where)); # endif #endif -#ifdef HAS_INT64_T -# define Quad_t int64_t -# define PERL_QUAD_IS_INT64_T -#else -# if LONGSIZE == 8 -# define Quad_t long +#ifndef Quad_t +# if LONGSIZE == 8 +# define Quad_t long +# define Uquad_t unsigned long # define PERL_QUAD_IS_LONG -# else -# ifdef USE_LONG_LONG /* See above note about LP32. --jhi */ -# if defined(HAS_LONG_LONG) && LONGLONGSIZE == 8 -# define Quad_t long long -# define PERL_QUAD_IS_LONG_LONG -# endif -# endif -# ifndef Quad_t -# if INTSIZE == 8 -# define Quad_t int -# define PERL_QUAD_IS_INT -# endif +# endif +#endif + +#ifndef Quad_t +# if INTSIZE == 8 +# define Quad_t int +# define Uquad_t unsigned int +# define PERL_QUAD_IS_INT +# endif +#endif + +#ifndef Quad_t +# ifdef USE_LONG_LONG /* See above note about LP32. --jhi */ +# if defined(HAS_LONG_LONG) && LONGLONGSIZE == 8 +# define Quad_t long long +# define Uquad_t unsigned long long +# define PERL_QUAD_IS_LONG_LONG # endif -# endif +# endif +#endif + +#ifndef Quad_t +# ifdef HAS_INT64_T +# define Quad_t int64_t +# define Uquad_t uint64_t +# define PERL_QUAD_IS_INT64_T +# endif #endif #ifdef Quad_t # define HAS_QUAD +# ifndef Uquad_t + /* Note that if your Quad_t is a typedef (not a #define) you *MUST* + * have defined by now Uquad_t yourself because 'unsigned type' + * is illegal. */ +# define Uquad_t unsigned Quad_t +# endif #endif -/* See above note on LP32 about the PTRSIZE test. --jhi */ -#if defined(HAS_QUAD) && (PTRSIZE > 4 || defined(USE_LONG_LONG)) - typedef Quad_t IV; - typedef unsigned Quad_t UV; +#if defined(USE_64_BITS) && defined(HAS_QUAD) +# ifdef PERL_QUAD_IS_LONG /* LP64 */ + typedef long IV; + typedef unsigned long UV; +# else +# ifdef PERL_QUAD_IS_INT /* ILP64 */ + typedef int IV; + typedef unsigned int UV; +# else +# ifdef PERL_QUAD_IS_LONG_LONG /* LL64 */ + typedef long long IV; + typedef unsigned long long UV; +# else +# ifdef PERL_QUAD_IS_INT64_T /* C9X */ + typedef int64_t IV; + typedef uint64_t UV; +# endif +# endif +# endif +# endif # if defined(PERL_QUAD_IS_INT64_T) && defined(INT64_MAX) # define IV_MAX INT64_MAX # define IV_MIN INT64_MIN @@ -906,8 +928,8 @@ Free_t Perl_free _((Malloc_t where)); # define UV_MIN PERL_UQUAD_MIN # endif #else - typedef long IV; - typedef unsigned long UV; + typedef long IV; + typedef unsigned long UV; # if defined(INT32_MAX) && LONGSIZE == 4 # define IV_MAX INT32_MAX # define IV_MIN INT32_MIN @@ -1165,10 +1187,14 @@ typedef union any ANY; #include "handy.h" +/* Some day when we have more 64-bit experience under our belts we may + * be able to merge some of the USE_64_BIT_{FILES,OFFSETS,STDIO,DBM}. At + * the moment (Oct 1998), though, keep them separate. --jhi + */ #ifdef USE_64_BITS # ifdef USE_64_BIT_FILES -# ifndef USE_64_BIT_IO -# define USE_64_BIT_IO +# ifndef USE_64_BIT_OFFSETS +# define USE_64_BIT_OFFSETS # endif # ifndef USE_64_BIT_STDIO # define USE_64_BIT_STDIO @@ -1177,7 +1203,8 @@ typedef union any ANY; # define USE_64_BIT_DBM # endif # endif -# ifdef USE_64_BIT_IO +/* Mention LSEEKSIZE here to get it included in %Config. */ +# ifdef USE_64_BIT_OFFSETS # ifdef HAS_FSTAT64 # define fstat fstat64 # endif @@ -1322,6 +1349,28 @@ typedef I32 (*filter_t) _((int, SV *, int)); # endif #endif +#ifndef MAXPATHLEN +# ifdef PATH_MAX +# ifdef _POSIX_PATH_MAX +# if PATH_MAX > _POSIX_PATH_MAX +/* MAXPATHLEN is supposed to include the final null character, + * as opposed to PATH_MAX and _POSIX_PATH_MAX. */ +# define MAXPATHLEN (PATH_MAX+1) +# else +# define MAXPATHLEN (_POSIX_PATH_MAX+1) +# endif +# else +# define MAXPATHLEN (PATH_MAX+1) +# endif +# else +# ifdef _POSIX_PATH_MAX +# define MAXPATHLEN (_POSIX_PATH_MAX+1) +# else +# define MAXPATHLEN 1024 /* Err on the large side. */ +# endif +# endif +#endif + #ifndef FUNC_NAME_TO_PTR #define FUNC_NAME_TO_PTR(name) name #endif @@ -1347,17 +1396,26 @@ typedef I32 (*filter_t) _((int, SV *, int)); # ifdef OS2 # include "os2thread.h" # else -# include -typedef pthread_t perl_os_thread; -typedef pthread_mutex_t perl_mutex; -typedef pthread_cond_t perl_cond; -typedef pthread_key_t perl_key; +# ifdef I_MACH_CTHREADS +# include +# ifdef NeXT +# define MUTEX_INIT_CALLS_MALLOC +# endif +typedef cthread_t perl_os_thread; +typedef mutex_t perl_mutex; +typedef condition_t perl_cond; +typedef void * perl_key; +# else /* Posix threads */ +# include +typedef pthread_t perl_os_thread; +typedef pthread_mutex_t perl_mutex; +typedef pthread_cond_t perl_cond; +typedef pthread_key_t perl_key; +# endif /* I_MACH_CTHREADS */ # endif /* OS2 */ # endif /* WIN32 */ # endif /* FAKE_THREADS */ #endif /* USE_THREADS */ - - #ifdef VMS # define STATUS_NATIVE PL_statusvalue_vms @@ -1457,7 +1515,9 @@ union any { #include "form.h" #include "gv.h" #include "cv.h" +#ifndef PERL_OBJECT #include "opcode.h" +#endif #include "op.h" #include "cop.h" #include "av.h" @@ -1514,11 +1574,6 @@ typedef struct { typedef I32 CHECKPOINT; #endif /* PERL_OBJECT */ -/* work around some libPW problems */ -#ifdef DOINIT -EXT char Error[1]; -#endif - #if defined(iAPX286) || defined(M_I286) || defined(I80286) # define I286 #endif @@ -1624,10 +1679,11 @@ Gid_t getgid _((void)); Gid_t getegid _((void)); #endif -#ifdef DEBUGGING #ifndef Perl_debug_log #define Perl_debug_log PerlIO_stderr() #endif + +#ifdef DEBUGGING #undef YYDEBUG #define YYDEBUG 1 #define DEB(a) a @@ -1790,8 +1846,22 @@ typedef Sighandler_t Sigsave_t; #endif #ifdef MYMALLOC -# define MALLOC_INIT MUTEX_INIT(&PL_malloc_mutex) -# define MALLOC_TERM MUTEX_DESTROY(&PL_malloc_mutex) +# ifdef MUTEX_INIT_CALLS_MALLOC +# define MALLOC_INIT \ + STMT_START { \ + PL_malloc_mutex = NULL; \ + MUTEX_INIT(&PL_malloc_mutex); \ + } STMT_END +# define MALLOC_TERM \ + STMT_START { \ + perl_mutex tmp = PL_malloc_mutex; \ + PL_malloc_mutex = NULL; \ + MUTEX_DESTROY(&tmp); \ + } STMT_END +# else +# define MALLOC_INIT MUTEX_INIT(&PL_malloc_mutex) +# define MALLOC_TERM MUTEX_DESTROY(&PL_malloc_mutex) +# endif #else # define MALLOC_INIT # define MALLOC_TERM @@ -1804,12 +1874,13 @@ typedef Sighandler_t Sigsave_t; */ #ifndef PERL_OBJECT -typedef int runops_proc_t _((void)); +typedef int (*runops_proc_t) _((void)); int runops_standard _((void)); #ifdef DEBUGGING int runops_debug _((void)); #endif -#endif /* PERL_OBJECT */ +#endif + /* _ (for $_) must be first in the following list (DEFSV requires it) */ #define THREADSV_NAMES "_123456789&`'+/.,\\\";^-%=|~:\001\005!@" @@ -1831,62 +1902,57 @@ EXT char *** environ_pointer; #endif /* environ processing */ -/* for tmp use in stupid debuggers */ -EXT int * di; -EXT short * ds; -EXT char * dc; - /* handy constants */ -EXTCONST char warn_uninit[] +EXTCONST char PL_warn_uninit[] INIT("Use of uninitialized value"); -EXTCONST char warn_nosemi[] +EXTCONST char PL_warn_nosemi[] INIT("Semicolon seems to be missing"); -EXTCONST char warn_reserved[] +EXTCONST char PL_warn_reserved[] INIT("Unquoted string \"%s\" may clash with future reserved word"); -EXTCONST char warn_nl[] +EXTCONST char PL_warn_nl[] INIT("Unsuccessful %s on filename containing newline"); -EXTCONST char no_wrongref[] +EXTCONST char PL_no_wrongref[] INIT("Can't use %s ref as %s ref"); -EXTCONST char no_symref[] +EXTCONST char PL_no_symref[] INIT("Can't use string (\"%.32s\") as %s ref while \"strict refs\" in use"); -EXTCONST char no_usym[] +EXTCONST char PL_no_usym[] INIT("Can't use an undefined value as %s reference"); -EXTCONST char no_aelem[] +EXTCONST char PL_no_aelem[] INIT("Modification of non-creatable array value attempted, subscript %d"); -EXTCONST char no_helem[] +EXTCONST char PL_no_helem[] INIT("Modification of non-creatable hash value attempted, subscript \"%s\""); -EXTCONST char no_modify[] +EXTCONST char PL_no_modify[] INIT("Modification of a read-only value attempted"); -EXTCONST char no_mem[] +EXTCONST char PL_no_mem[] INIT("Out of memory!\n"); -EXTCONST char no_security[] +EXTCONST char PL_no_security[] INIT("Insecure dependency in %s%s"); -EXTCONST char no_sock_func[] +EXTCONST char PL_no_sock_func[] INIT("Unsupported socket function \"%s\" called"); -EXTCONST char no_dir_func[] +EXTCONST char PL_no_dir_func[] INIT("Unsupported directory function \"%s\" called"); -EXTCONST char no_func[] +EXTCONST char PL_no_func[] INIT("The %s function is unimplemented"); -EXTCONST char no_myglob[] +EXTCONST char PL_no_myglob[] INIT("\"my\" variable %s can't be in a package"); #ifdef DOINIT -EXT char *sig_name[] = { SIG_NAME }; -EXT int sig_num[] = { SIG_NUM }; -EXT SV * psig_ptr[sizeof(sig_num)/sizeof(*sig_num)]; -EXT SV * psig_name[sizeof(sig_num)/sizeof(*sig_num)]; +EXT char *PL_sig_name[] = { SIG_NAME }; +EXT int PL_sig_num[] = { SIG_NUM }; +EXT SV * PL_psig_ptr[sizeof(PL_sig_num)/sizeof(*PL_sig_num)]; +EXT SV * PL_psig_name[sizeof(PL_sig_num)/sizeof(*PL_sig_num)]; #else -EXT char *sig_name[]; -EXT int sig_num[]; -EXT SV * psig_ptr[]; -EXT SV * psig_name[]; +EXT char *PL_sig_name[]; +EXT int PL_sig_num[]; +EXT SV * PL_psig_ptr[]; +EXT SV * PL_psig_name[]; #endif /* fast case folding tables */ #ifdef DOINIT #ifdef EBCDIC -EXT unsigned char fold[] = { /* fast EBCDIC case folding table */ +EXT unsigned char PL_fold[] = { /* fast EBCDIC case folding table */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, @@ -1921,7 +1987,7 @@ EXT unsigned char fold[] = { /* fast EBCDIC case folding table */ 248, 249, 250, 251, 252, 253, 254, 255 }; #else /* ascii rather than ebcdic */ -EXTCONST unsigned char fold[] = { +EXTCONST unsigned char PL_fold[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, @@ -1957,11 +2023,11 @@ EXTCONST unsigned char fold[] = { }; #endif /* !EBCDIC */ #else -EXTCONST unsigned char fold[]; +EXTCONST unsigned char PL_fold[]; #endif #ifdef DOINIT -EXT unsigned char fold_locale[] = { +EXT unsigned char PL_fold_locale[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, @@ -1996,12 +2062,12 @@ EXT unsigned char fold_locale[] = { 248, 249, 250, 251, 252, 253, 254, 255 }; #else -EXT unsigned char fold_locale[]; +EXT unsigned char PL_fold_locale[]; #endif #ifdef DOINIT #ifdef EBCDIC -EXT unsigned char freq[] = {/* EBCDIC frequencies for mixed English/C */ +EXT unsigned char PL_freq[] = {/* EBCDIC frequencies for mixed English/C */ 1, 2, 84, 151, 154, 155, 156, 157, 165, 246, 250, 3, 158, 7, 18, 29, 40, 51, 62, 73, 85, 96, 107, 118, @@ -2036,7 +2102,7 @@ EXT unsigned char freq[] = {/* EBCDIC frequencies for mixed English/C */ 191, 183, 141, 142, 143, 144, 145, 146 }; #else /* ascii rather than ebcdic */ -EXTCONST unsigned char freq[] = { /* letter frequencies for mixed English/C */ +EXTCONST unsigned char PL_freq[] = { /* letter frequencies for mixed English/C */ 1, 2, 84, 151, 154, 155, 156, 157, 165, 246, 250, 3, 158, 7, 18, 29, 40, 51, 62, 73, 85, 96, 107, 118, @@ -2072,12 +2138,12 @@ EXTCONST unsigned char freq[] = { /* letter frequencies for mixed English/C */ }; #endif #else -EXTCONST unsigned char freq[]; +EXTCONST unsigned char PL_freq[]; #endif #ifdef DEBUGGING #ifdef DOINIT -EXTCONST char* block_type[] = { +EXTCONST char* PL_block_type[] = { "NULL", "SUB", "EVAL", @@ -2086,7 +2152,7 @@ EXTCONST char* block_type[] = { "BLOCK", }; #else -EXTCONST char* block_type[]; +EXTCONST char* PL_block_type[]; #endif #endif @@ -2108,6 +2174,39 @@ typedef enum { XTERMBLOCK } expectation; +enum { /* pass one of these to get_vtbl */ + want_vtbl_sv, + want_vtbl_env, + want_vtbl_envelem, + want_vtbl_sig, + want_vtbl_sigelem, + want_vtbl_pack, + want_vtbl_packelem, + want_vtbl_dbline, + want_vtbl_isa, + want_vtbl_isaelem, + want_vtbl_arylen, + want_vtbl_glob, + want_vtbl_mglob, + want_vtbl_nkeys, + want_vtbl_taint, + want_vtbl_substr, + want_vtbl_vec, + want_vtbl_pos, + want_vtbl_bm, + want_vtbl_fm, + want_vtbl_uvar, + want_vtbl_defelem, + want_vtbl_regexp, + want_vtbl_collxfrm, + want_vtbl_amagic, + want_vtbl_amagicelem, +#ifdef USE_THREADS + want_vtbl_mutex, +#endif + want_vtbl_regdata, + want_vtbl_regdatum +}; /* Note: the lowest 8 bits are reserved for stuffing into op->op_private */ @@ -2174,7 +2273,10 @@ typedef struct exitlistentry { #ifdef PERL_OBJECT extern "C" CPerlObj* perl_alloc _((IPerlMem*, IPerlEnv*, IPerlStdIO*, IPerlLIO*, IPerlDir*, IPerlSock*, IPerlProc*)); +#ifdef PERL_OBJECT typedef int (CPerlObj::*runops_proc_t) _((void)); +#endif /* PERL_OBJECT */ + #undef EXT #define EXT #undef EXTCONST @@ -2214,9 +2316,7 @@ struct perl_vars *PL_VarsPtr; */ struct interpreter { -#ifndef USE_THREADS #include "thrdvar.h" -#endif #include "intrpvar.h" }; @@ -2251,17 +2351,14 @@ typedef void *Thread; #include "pp.h" #include "proto.h" -#ifdef EMBED #define Perl_sv_setptrobj(rv,ptr,name) Perl_sv_setref_iv(rv,name,(IV)ptr) #define Perl_sv_setptrref(rv,ptr) Perl_sv_setref_iv(rv,Nullch,(IV)ptr) -#else -#define sv_setptrobj(rv,ptr,name) sv_setref_iv(rv,name,(IV)ptr) -#define sv_setptrref(rv,ptr) sv_setref_iv(rv,Nullch,(IV)ptr) -#endif /* The following must follow proto.h as #defines mess up syntax */ -#include "embedvar.h" +#if !defined(PERL_FOR_X2P) +# include "embedvar.h" +#endif /* Now include all the 'global' variables * If we don't have threads or multiple interpreters @@ -2294,14 +2391,21 @@ typedef void *Thread; PERLVAR(object_compatibility[30], char) }; -#include "objpp.h" -#ifdef DOINIT -#include "INTERN.h" -#else -#include "EXTERN.h" -#endif -#endif /* PERL_OBJECT */ +# include "embed.h" +# if defined(WIN32) && !defined(WIN32IO_IS_STDIO) +# define errno CPerlObj::ErrorNo() +# endif + +# ifdef DOINIT +# include "INTERN.h" +# else +# include "EXTERN.h" +# endif + +/* this has structure inits, so it cannot be included before here */ +# include "opcode.h" +#endif /* PERL_OBJECT */ #undef PERLVAR #undef PERLVARI @@ -2321,134 +2425,172 @@ PERLVAR(object_compatibility[30], char) #ifdef DOINIT -EXT MGVTBL vtbl_sv = {magic_get, +EXT MGVTBL PL_vtbl_sv = {magic_get, magic_set, magic_len, 0, 0}; -EXT MGVTBL vtbl_env = {0, magic_set_all_env, +EXT MGVTBL PL_vtbl_env = {0, magic_set_all_env, 0, magic_clear_all_env, 0}; -EXT MGVTBL vtbl_envelem = {0, magic_setenv, +EXT MGVTBL PL_vtbl_envelem = {0, magic_setenv, 0, magic_clearenv, 0}; -EXT MGVTBL vtbl_sig = {0, 0, 0, 0, 0}; -EXT MGVTBL vtbl_sigelem = {magic_getsig, +EXT MGVTBL PL_vtbl_sig = {0, 0, 0, 0, 0}; +EXT MGVTBL PL_vtbl_sigelem = {magic_getsig, magic_setsig, 0, magic_clearsig, 0}; -EXT MGVTBL vtbl_pack = {0, 0, magic_sizepack, magic_wipepack, +EXT MGVTBL PL_vtbl_pack = {0, 0, magic_sizepack, magic_wipepack, 0}; -EXT MGVTBL vtbl_packelem = {magic_getpack, +EXT MGVTBL PL_vtbl_packelem = {magic_getpack, magic_setpack, 0, magic_clearpack, 0}; -EXT MGVTBL vtbl_dbline = {0, magic_setdbline, +EXT MGVTBL PL_vtbl_dbline = {0, magic_setdbline, 0, 0, 0}; -EXT MGVTBL vtbl_isa = {0, magic_setisa, +EXT MGVTBL PL_vtbl_isa = {0, magic_setisa, 0, magic_setisa, 0}; -EXT MGVTBL vtbl_isaelem = {0, magic_setisa, +EXT MGVTBL PL_vtbl_isaelem = {0, magic_setisa, 0, 0, 0}; -EXT MGVTBL vtbl_arylen = {magic_getarylen, +EXT MGVTBL PL_vtbl_arylen = {magic_getarylen, magic_setarylen, 0, 0, 0}; -EXT MGVTBL vtbl_glob = {magic_getglob, +EXT MGVTBL PL_vtbl_glob = {magic_getglob, magic_setglob, 0, 0, 0}; -EXT MGVTBL vtbl_mglob = {0, magic_setmglob, +EXT MGVTBL PL_vtbl_mglob = {0, magic_setmglob, 0, 0, 0}; -EXT MGVTBL vtbl_nkeys = {magic_getnkeys, +EXT MGVTBL PL_vtbl_nkeys = {magic_getnkeys, magic_setnkeys, 0, 0, 0}; -EXT MGVTBL vtbl_taint = {magic_gettaint,magic_settaint, +EXT MGVTBL PL_vtbl_taint = {magic_gettaint,magic_settaint, 0, 0, 0}; -EXT MGVTBL vtbl_substr = {magic_getsubstr, magic_setsubstr, +EXT MGVTBL PL_vtbl_substr = {magic_getsubstr, magic_setsubstr, 0, 0, 0}; -EXT MGVTBL vtbl_vec = {magic_getvec, +EXT MGVTBL PL_vtbl_vec = {magic_getvec, magic_setvec, 0, 0, 0}; -EXT MGVTBL vtbl_pos = {magic_getpos, +EXT MGVTBL PL_vtbl_pos = {magic_getpos, magic_setpos, 0, 0, 0}; -EXT MGVTBL vtbl_bm = {0, magic_setbm, +EXT MGVTBL PL_vtbl_bm = {0, magic_setbm, 0, 0, 0}; -EXT MGVTBL vtbl_fm = {0, magic_setfm, +EXT MGVTBL PL_vtbl_fm = {0, magic_setfm, 0, 0, 0}; -EXT MGVTBL vtbl_uvar = {magic_getuvar, +EXT MGVTBL PL_vtbl_uvar = {magic_getuvar, magic_setuvar, 0, 0, 0}; #ifdef USE_THREADS -EXT MGVTBL vtbl_mutex = {0, 0, 0, 0, magic_mutexfree}; +EXT MGVTBL PL_vtbl_mutex = {0, 0, 0, 0, magic_mutexfree}; #endif /* USE_THREADS */ -EXT MGVTBL vtbl_defelem = {magic_getdefelem,magic_setdefelem, +EXT MGVTBL PL_vtbl_defelem = {magic_getdefelem,magic_setdefelem, 0, 0, 0}; -EXT MGVTBL vtbl_regexp = {0,0,0,0, magic_freeregexp}; -EXT MGVTBL vtbl_regdata = {0, 0, magic_regdata_cnt, 0, 0}; -EXT MGVTBL vtbl_regdatum = {magic_regdatum_get, 0, 0, 0, 0}; +EXT MGVTBL PL_vtbl_regexp = {0,0,0,0, magic_freeregexp}; +EXT MGVTBL PL_vtbl_regdata = {0, 0, magic_regdata_cnt, 0, 0}; +EXT MGVTBL PL_vtbl_regdatum = {magic_regdatum_get, 0, 0, 0, 0}; #ifdef USE_LOCALE_COLLATE -EXT MGVTBL vtbl_collxfrm = {0, +EXT MGVTBL PL_vtbl_collxfrm = {0, magic_setcollxfrm, 0, 0, 0}; #endif #ifdef OVERLOAD -EXT MGVTBL vtbl_amagic = {0, magic_setamagic, +EXT MGVTBL PL_vtbl_amagic = {0, magic_setamagic, 0, 0, magic_setamagic}; -EXT MGVTBL vtbl_amagicelem = {0, magic_setamagic, +EXT MGVTBL PL_vtbl_amagicelem = {0, magic_setamagic, 0, 0, magic_setamagic}; #endif /* OVERLOAD */ #else /* !DOINIT */ -EXT MGVTBL vtbl_sv; -EXT MGVTBL vtbl_env; -EXT MGVTBL vtbl_envelem; -EXT MGVTBL vtbl_sig; -EXT MGVTBL vtbl_sigelem; -EXT MGVTBL vtbl_pack; -EXT MGVTBL vtbl_packelem; -EXT MGVTBL vtbl_dbline; -EXT MGVTBL vtbl_isa; -EXT MGVTBL vtbl_isaelem; -EXT MGVTBL vtbl_arylen; -EXT MGVTBL vtbl_glob; -EXT MGVTBL vtbl_mglob; -EXT MGVTBL vtbl_nkeys; -EXT MGVTBL vtbl_taint; -EXT MGVTBL vtbl_substr; -EXT MGVTBL vtbl_vec; -EXT MGVTBL vtbl_pos; -EXT MGVTBL vtbl_bm; -EXT MGVTBL vtbl_fm; -EXT MGVTBL vtbl_uvar; +EXT MGVTBL PL_vtbl_sv; +EXT MGVTBL PL_vtbl_env; +EXT MGVTBL PL_vtbl_envelem; +EXT MGVTBL PL_vtbl_sig; +EXT MGVTBL PL_vtbl_sigelem; +EXT MGVTBL PL_vtbl_pack; +EXT MGVTBL PL_vtbl_packelem; +EXT MGVTBL PL_vtbl_dbline; +EXT MGVTBL PL_vtbl_isa; +EXT MGVTBL PL_vtbl_isaelem; +EXT MGVTBL PL_vtbl_arylen; +EXT MGVTBL PL_vtbl_glob; +EXT MGVTBL PL_vtbl_mglob; +EXT MGVTBL PL_vtbl_nkeys; +EXT MGVTBL PL_vtbl_taint; +EXT MGVTBL PL_vtbl_substr; +EXT MGVTBL PL_vtbl_vec; +EXT MGVTBL PL_vtbl_pos; +EXT MGVTBL PL_vtbl_bm; +EXT MGVTBL PL_vtbl_fm; +EXT MGVTBL PL_vtbl_uvar; #ifdef USE_THREADS -EXT MGVTBL vtbl_mutex; +EXT MGVTBL PL_vtbl_mutex; #endif /* USE_THREADS */ -EXT MGVTBL vtbl_defelem; -EXT MGVTBL vtbl_regexp; -EXT MGVTBL vtbl_regdata; -EXT MGVTBL vtbl_regdatum; +EXT MGVTBL PL_vtbl_defelem; +EXT MGVTBL PL_vtbl_regexp; +EXT MGVTBL PL_vtbl_regdata; +EXT MGVTBL PL_vtbl_regdatum; #ifdef USE_LOCALE_COLLATE -EXT MGVTBL vtbl_collxfrm; +EXT MGVTBL PL_vtbl_collxfrm; #endif #ifdef OVERLOAD -EXT MGVTBL vtbl_amagic; -EXT MGVTBL vtbl_amagicelem; +EXT MGVTBL PL_vtbl_amagic; +EXT MGVTBL PL_vtbl_amagicelem; #endif /* OVERLOAD */ #endif /* !DOINIT */ #ifdef OVERLOAD -#define NofAMmeth 58 +enum { + fallback_amg, abs_amg, + bool__amg, nomethod_amg, + string_amg, numer_amg, + add_amg, add_ass_amg, + subtr_amg, subtr_ass_amg, + mult_amg, mult_ass_amg, + div_amg, div_ass_amg, + modulo_amg, modulo_ass_amg, + pow_amg, pow_ass_amg, + lshift_amg, lshift_ass_amg, + rshift_amg, rshift_ass_amg, + band_amg, band_ass_amg, + bor_amg, bor_ass_amg, + bxor_amg, bxor_ass_amg, + lt_amg, le_amg, + gt_amg, ge_amg, + eq_amg, ne_amg, + ncmp_amg, scmp_amg, + slt_amg, sle_amg, + sgt_amg, sge_amg, + seq_amg, sne_amg, + not_amg, compl_amg, + inc_amg, dec_amg, + atan2_amg, cos_amg, + sin_amg, exp_amg, + log_amg, sqrt_amg, + repeat_amg, repeat_ass_amg, + concat_amg, concat_ass_amg, + copy_amg, neg_amg, + to_sv_amg, to_av_amg, + to_hv_amg, to_gv_amg, + to_cv_amg, iter_amg, + max_amg_code + /* Do not leave a trailing comma here. C9X allows it, C89 doesn't. */ +}; + +#define NofAMmeth max_amg_code + #ifdef DOINIT -EXTCONST char * AMG_names[NofAMmeth] = { +EXTCONST char * PL_AMG_names[NofAMmeth] = { "fallback", "abs", /* "fallback" should be the first. */ "bool", "nomethod", "\"\"", "0+", @@ -2477,10 +2619,13 @@ EXTCONST char * AMG_names[NofAMmeth] = { "log", "sqrt", "x", "x=", ".", ".=", - "=", "neg" + "=", "neg", + "${}", "@{}", + "%{}", "*{}", + "&{}", "<>", }; #else -EXTCONST char * AMG_names[NofAMmeth]; +EXTCONST char * PL_AMG_names[NofAMmeth]; #endif /* def INITAMAGIC */ struct am_table { @@ -2507,37 +2652,6 @@ typedef struct am_table_short AMTS; #define AMT_AMAGIC_on(amt) ((amt)->flags |= AMTf_AMAGIC) #define AMT_AMAGIC_off(amt) ((amt)->flags &= ~AMTf_AMAGIC) -enum { - fallback_amg, abs_amg, - bool__amg, nomethod_amg, - string_amg, numer_amg, - add_amg, add_ass_amg, - subtr_amg, subtr_ass_amg, - mult_amg, mult_ass_amg, - div_amg, div_ass_amg, - modulo_amg, modulo_ass_amg, - pow_amg, pow_ass_amg, - lshift_amg, lshift_ass_amg, - rshift_amg, rshift_ass_amg, - band_amg, band_ass_amg, - bor_amg, bor_ass_amg, - bxor_amg, bxor_ass_amg, - lt_amg, le_amg, - gt_amg, ge_amg, - eq_amg, ne_amg, - ncmp_amg, scmp_amg, - slt_amg, sle_amg, - sgt_amg, sge_amg, - seq_amg, sne_amg, - not_amg, compl_amg, - inc_amg, dec_amg, - atan2_amg, cos_amg, - sin_amg, exp_amg, - log_amg, sqrt_amg, - repeat_amg, repeat_ass_amg, - concat_amg, concat_ass_amg, - copy_amg, neg_amg -}; /* * some compilers like to redefine cos et alia as faster @@ -2664,4 +2778,22 @@ enum { # endif #endif +/* Mention INSTALL_USR_BIN_PERL here so that Configure picks it up. */ + +#ifdef IAMSUID + +#ifdef I_SYS_STATVFS +# include +#else +# ifdef I_SYS_MOUNT +# include +# else +# ifdef I_MNTENT +# include +# endif +# endif +#endif + +#endif /* IAMSUID */ + #endif /* Include guard */