X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=d2898fe87e352a4d83f20b02f5798fdcef76dc1e;hb=c2611fb358d57faaf2390cf4e8c5224abf2c4cc4;hp=e84c42ed774de200aa244bee87e9eea42f12904c;hpb=6a27c1886bf0bf3e39d48bdfab21e85f07acacb3;p=p5sagit%2Fp5-mst-13.2.git diff --git a/proto.h b/proto.h index e84c42e..d2898fe 100644 --- a/proto.h +++ b/proto.h @@ -1,10 +1,19 @@ +#ifndef PERL_CALLCONV +# define PERL_CALLCONV +#endif + #ifdef PERL_OBJECT -#define VIRTUAL virtual +#define VIRTUAL virtual PERL_CALLCONV #else -#define VIRTUAL +#define VIRTUAL PERL_CALLCONV START_EXTERN_C #endif +/* NOTE!!! When new virtual functions are added, they must be added at + * the end of this file to maintain binary compatibility with PERL_OBJECT + */ + + #ifndef NEXT30_NO_ATTRIBUTE #ifndef HASATTRIBUTE /* disable GNU-cc attribute checking? */ #ifdef __attribute__ /* Avoid possible redefinition errors */ @@ -13,10 +22,8 @@ START_EXTERN_C #define __attribute__(attr) #endif #endif -#ifdef OVERLOAD VIRTUAL SV* amagic_call _((SV* left,SV* right,int method,int dir)); VIRTUAL bool Gv_AMupdate _((HV* stash)); -#endif /* OVERLOAD */ VIRTUAL OP* append_elem _((I32 optype, OP* head, OP* tail)); VIRTUAL OP* append_list _((I32 optype, LISTOP* first, LISTOP* last)); VIRTUAL I32 apply _((I32 type, SV** mark, SV** sp)); @@ -47,14 +54,14 @@ VIRTUAL int block_start _((int full)); VIRTUAL void boot_core_UNIVERSAL _((void)); VIRTUAL void call_list _((I32 oldscope, AV* av_list)); VIRTUAL I32 cando _((I32 bit, I32 effective, Stat_t* statbufp)); -#ifndef CASTNEGFLOAT VIRTUAL U32 cast_ulong _((double f)); -#endif +VIRTUAL I32 cast_i32 _((double f)); +VIRTUAL IV cast_iv _((double f)); +VIRTUAL UV cast_uv _((double f)); #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP) VIRTUAL I32 my_chsize _((int fd, Off_t length)); #endif -VIRTUAL OP* ck_gvconst _((OP* o)); -VIRTUAL OP* ck_retarget _((OP* o)); + #ifdef USE_THREADS VIRTUAL MAGIC * condpair_magic _((SV *sv)); #endif @@ -109,17 +116,18 @@ VIRTUAL void do_pipe _((SV* sv, GV* rgv, GV* wgv)); VIRTUAL bool do_print _((SV* sv, PerlIO* fp)); VIRTUAL OP* do_readline _((void)); VIRTUAL I32 do_chomp _((SV* sv)); -VIRTUAL bool do_seek _((GV* gv, long pos, int whence)); +VIRTUAL bool do_seek _((GV* gv, Off_t pos, int whence)); #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) I32 do_semop _((SV** mark, SV** sp)); I32 do_shmio _((I32 optype, SV** mark, SV** sp)); #endif VIRTUAL void do_sprintf _((SV* sv, I32 len, SV** sarg)); -VIRTUAL long do_sysseek _((GV* gv, long pos, int whence)); -VIRTUAL long do_tell _((GV* gv)); -VIRTUAL I32 do_trans _((SV* sv, OP* arg)); +VIRTUAL Off_t do_sysseek _((GV* gv, Off_t pos, int whence)); +VIRTUAL Off_t do_tell _((GV* gv)); +VIRTUAL I32 do_trans _((SV* sv)); VIRTUAL void do_vecset _((SV* sv)); VIRTUAL void do_vop _((I32 optype, SV* sv, SV* left, SV* right)); +VIRTUAL OP* dofile _((OP* term)); VIRTUAL I32 dowantarray _((void)); VIRTUAL void dump_all _((void)); VIRTUAL void dump_eval _((void)); @@ -127,19 +135,19 @@ VIRTUAL void dump_eval _((void)); VIRTUAL void dump_fds _((char* s)); #endif VIRTUAL void dump_form _((GV* gv)); -VIRTUAL void dump_gv _((GV* gv)); +VIRTUAL void gv_dump _((GV* gv)); #ifdef MYMALLOC VIRTUAL void dump_mstats _((char* s)); #endif -VIRTUAL void dump_op _((OP* arg)); -VIRTUAL void dump_pm _((PMOP* pm)); +VIRTUAL void op_dump _((OP* arg)); +VIRTUAL void pmop_dump _((PMOP* pm)); VIRTUAL void dump_packsubs _((HV* stash)); VIRTUAL void dump_sub _((GV* gv)); VIRTUAL void fbm_compile _((SV* sv, U32 flags)); VIRTUAL char* fbm_instr _((unsigned char* big, unsigned char* bigend, SV* littlesv, U32 flags)); VIRTUAL char* find_script _((char *scriptname, bool dosearch, char **search_ext, I32 flags)); #ifdef USE_THREADS -VIRTUAL PADOFFSET find_threadsv _((char *name)); +VIRTUAL PADOFFSET find_threadsv _((const char *name)); #endif VIRTUAL OP* force_list _((OP* arg)); VIRTUAL OP* fold_constants _((OP* arg)); @@ -151,28 +159,28 @@ VIRTUAL GP* gp_ref _((GP* gp)); VIRTUAL GV* gv_AVadd _((GV* gv)); VIRTUAL GV* gv_HVadd _((GV* gv)); VIRTUAL GV* gv_IOadd _((GV* gv)); -VIRTUAL GV* gv_autoload4 _((HV* stash, char* name, STRLEN len, I32 method)); +VIRTUAL GV* gv_autoload4 _((HV* stash, const char* name, STRLEN len, I32 method)); VIRTUAL void gv_check _((HV* stash)); VIRTUAL void gv_efullname _((SV* sv, GV* gv)); -VIRTUAL void gv_efullname3 _((SV* sv, GV* gv, char* prefix)); -VIRTUAL GV* gv_fetchfile _((char* name)); -VIRTUAL GV* gv_fetchmeth _((HV* stash, char* name, STRLEN len, I32 level)); -VIRTUAL GV* gv_fetchmethod _((HV* stash, char* name)); -VIRTUAL GV* gv_fetchmethod_autoload _((HV* stash, char* name, I32 autoload)); -VIRTUAL GV* gv_fetchpv _((char* name, I32 add, I32 sv_type)); +VIRTUAL void gv_efullname3 _((SV* sv, GV* gv, const char* prefix)); +VIRTUAL GV* gv_fetchfile _((const char* name)); +VIRTUAL GV* gv_fetchmeth _((HV* stash, const char* name, STRLEN len, I32 level)); +VIRTUAL GV* gv_fetchmethod _((HV* stash, const char* name)); +VIRTUAL GV* gv_fetchmethod_autoload _((HV* stash, const char* name, I32 autoload)); +VIRTUAL GV* gv_fetchpv _((const char* name, I32 add, I32 sv_type)); VIRTUAL void gv_fullname _((SV* sv, GV* gv)); -VIRTUAL void gv_fullname3 _((SV* sv, GV* gv, char* prefix)); -VIRTUAL void gv_init _((GV* gv, HV* stash, char* name, STRLEN len, int multi)); -VIRTUAL HV* gv_stashpv _((char* name, I32 create)); -VIRTUAL HV* gv_stashpvn _((char* name, U32 namelen, I32 create)); +VIRTUAL void gv_fullname3 _((SV* sv, GV* gv, const char* prefix)); +VIRTUAL void gv_init _((GV* gv, HV* stash, const char* name, STRLEN len, int multi)); +VIRTUAL HV* gv_stashpv _((const char* name, I32 create)); +VIRTUAL HV* gv_stashpvn _((const char* name, U32 namelen, I32 create)); VIRTUAL HV* gv_stashsv _((SV* sv, I32 create)); VIRTUAL void hv_clear _((HV* tb)); VIRTUAL void hv_delayfree_ent _((HV* hv, HE* entry)); -VIRTUAL SV* hv_delete _((HV* tb, char* key, U32 klen, I32 flags)); +VIRTUAL SV* hv_delete _((HV* tb, const char* key, U32 klen, I32 flags)); VIRTUAL SV* hv_delete_ent _((HV* tb, SV* key, I32 flags, U32 hash)); -VIRTUAL bool hv_exists _((HV* tb, char* key, U32 klen)); +VIRTUAL bool hv_exists _((HV* tb, const char* key, U32 klen)); VIRTUAL bool hv_exists_ent _((HV* tb, SV* key, U32 hash)); -VIRTUAL SV** hv_fetch _((HV* tb, char* key, U32 klen, I32 lval)); +VIRTUAL SV** hv_fetch _((HV* tb, const char* key, U32 klen, I32 lval)); VIRTUAL HE* hv_fetch_ent _((HV* tb, SV* key, I32 lval, U32 hash)); VIRTUAL void hv_free_ent _((HV* hv, HE* entry)); VIRTUAL I32 hv_iterinit _((HV* tb)); @@ -183,15 +191,15 @@ VIRTUAL SV* hv_iternextsv _((HV* hv, char** key, I32* retlen)); VIRTUAL SV* hv_iterval _((HV* tb, HE* entry)); VIRTUAL void hv_ksplit _((HV* hv, IV newmax)); VIRTUAL void hv_magic _((HV* hv, GV* gv, int how)); -VIRTUAL SV** hv_store _((HV* tb, char* key, U32 klen, SV* val, U32 hash)); +VIRTUAL SV** hv_store _((HV* tb, const char* key, U32 klen, SV* val, U32 hash)); VIRTUAL HE* hv_store_ent _((HV* tb, SV* key, SV* val, U32 hash)); VIRTUAL void hv_undef _((HV* tb)); -VIRTUAL I32 ibcmp _((char* a, char* b, I32 len)); -VIRTUAL I32 ibcmp_locale _((char* a, char* b, I32 len)); +VIRTUAL I32 ibcmp _((const char* a, const char* b, I32 len)); +VIRTUAL I32 ibcmp_locale _((const char* a, const char* b, I32 len)); VIRTUAL I32 ingroup _((I32 testgid, I32 effective)); VIRTUAL void init_stacks _((ARGSproto)); VIRTUAL U32 intro_my _((void)); -VIRTUAL char* instr _((char* big, char* little)); +VIRTUAL char* instr _((const char* big, const char* little)); VIRTUAL bool io_close _((IO* io)); VIRTUAL OP* invert _((OP* cmd)); VIRTUAL bool is_uni_alnum _((U32 c)); @@ -216,15 +224,15 @@ VIRTUAL bool is_uni_print_lc _((U32 c)); VIRTUAL U32 to_uni_upper_lc _((U32 c)); VIRTUAL U32 to_uni_title_lc _((U32 c)); VIRTUAL U32 to_uni_lower_lc _((U32 c)); -VIRTUAL bool is_utf8_alnum _((unsigned char *p)); -VIRTUAL bool is_utf8_idfirst _((unsigned char *p)); -VIRTUAL bool is_utf8_alpha _((unsigned char *p)); -VIRTUAL bool is_utf8_space _((unsigned char *p)); -VIRTUAL bool is_utf8_digit _((unsigned char *p)); -VIRTUAL bool is_utf8_upper _((unsigned char *p)); -VIRTUAL bool is_utf8_lower _((unsigned char *p)); -VIRTUAL bool is_utf8_print _((unsigned char *p)); -VIRTUAL bool is_utf8_mark _((unsigned char *p)); +VIRTUAL bool is_utf8_alnum _((U8 *p)); +VIRTUAL bool is_utf8_idfirst _((U8 *p)); +VIRTUAL bool is_utf8_alpha _((U8 *p)); +VIRTUAL bool is_utf8_space _((U8 *p)); +VIRTUAL bool is_utf8_digit _((U8 *p)); +VIRTUAL bool is_utf8_upper _((U8 *p)); +VIRTUAL bool is_utf8_lower _((U8 *p)); +VIRTUAL bool is_utf8_print _((U8 *p)); +VIRTUAL bool is_utf8_mark _((U8 *p)); VIRTUAL OP* jmaybe _((OP* arg)); VIRTUAL I32 keyword _((char* d, I32 len)); VIRTUAL void leave_scope _((I32 base)); @@ -258,10 +266,10 @@ VIRTUAL U32 magic_len _((SV* sv, MAGIC* mg)); VIRTUAL int magic_mutexfree _((SV* sv, MAGIC* mg)); #endif /* USE_THREADS */ VIRTUAL int magic_nextpack _((SV* sv, MAGIC* mg, SV* key)); +VIRTUAL U32 magic_regdata_cnt _((SV* sv, MAGIC* mg)); +VIRTUAL int magic_regdatum_get _((SV* sv, MAGIC* mg)); VIRTUAL int magic_set _((SV* sv, MAGIC* mg)); -#ifdef OVERLOAD VIRTUAL int magic_setamagic _((SV* sv, MAGIC* mg)); -#endif /* OVERLOAD */ VIRTUAL int magic_setarylen _((SV* sv, MAGIC* mg)); VIRTUAL int magic_setbm _((SV* sv, MAGIC* mg)); VIRTUAL int magic_setdbline _((SV* sv, MAGIC* mg)); @@ -296,7 +304,7 @@ VIRTUAL char* mem_collxfrm _((const char* s, STRLEN len, STRLEN* xlen)); #endif VIRTUAL char* mess _((const char* pat, va_list* args)); VIRTUAL int mg_clear _((SV* sv)); -VIRTUAL int mg_copy _((SV* sv, SV* nsv, char* key, I32 klen)); +VIRTUAL int mg_copy _((SV* sv, SV* nsv, const char* key, I32 klen)); VIRTUAL MAGIC* mg_find _((SV* sv, int type)); VIRTUAL int mg_free _((SV* sv)); VIRTUAL int mg_get _((SV* sv)); @@ -308,7 +316,7 @@ VIRTUAL OP* mod _((OP* o, I32 type)); VIRTUAL char* moreswitches _((char* s)); VIRTUAL OP* my _((OP* o)); #if !defined(HAS_BCOPY) || !defined(HAS_SAFE_BCOPY) -VIRTUAL char* my_bcopy _((char* from, char* to, I32 len)); +VIRTUAL char* my_bcopy _((const char* from, char* to, I32 len)); #endif #if !defined(HAS_BZERO) && !defined(HAS_MEMSET) char* my_bzero _((char* loc, I32 len)); @@ -317,7 +325,7 @@ VIRTUAL void my_exit _((U32 status)) __attribute__((noreturn)); VIRTUAL void my_failure_exit _((void)) __attribute__((noreturn)); VIRTUAL I32 my_lstat _((ARGSproto)); #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP) -VIRTUAL I32 my_memcmp _((char* s1, char* s2, I32 len)); +VIRTUAL I32 my_memcmp _((const char* s1, const char* s2, I32 len)); #endif #if !defined(HAS_MEMSET) VIRTUAL void* my_memset _((char* loc, I32 ch, I32 len)); @@ -349,7 +357,7 @@ VIRTUAL OP* newNULLLIST _((void)); VIRTUAL OP* newOP _((I32 optype, I32 flags)); VIRTUAL void newPROG _((OP* o)); VIRTUAL OP* newRANGE _((I32 flags, OP* left, OP* right)); -VIRTUAL OP* newSLICEOP _((I32 flags, OP* subscript, OP* list)); +VIRTUAL OP* newSLICEOP _((I32 flags, OP* subscript, OP* listop)); VIRTUAL OP* newSTATEOP _((I32 flags, char* label, OP* o)); VIRTUAL CV* newSUB _((I32 floor, OP* o, OP* proto, OP* block)); VIRTUAL CV* newXS _((char* name, void (*subaddr)(CV* cv _CPERLproto), char* filename)); @@ -374,10 +382,10 @@ VIRTUAL OP* newSVREF _((OP* o)); VIRTUAL OP* newSVOP _((I32 type, I32 flags, SV* sv)); VIRTUAL SV* newSViv _((IV i)); VIRTUAL SV* newSVnv _((double n)); -VIRTUAL SV* newSVpv _((char* s, STRLEN len)); -VIRTUAL SV* newSVpvn _((char *s, STRLEN len)); +VIRTUAL SV* newSVpv _((const char* s, STRLEN len)); +VIRTUAL SV* newSVpvn _((const char *s, STRLEN len)); VIRTUAL SV* newSVpvf _((const char* pat, ...)); -VIRTUAL SV* newSVrv _((SV* rv, char* classname)); +VIRTUAL SV* newSVrv _((SV* rv, const char* classname)); VIRTUAL SV* newSVsv _((SV* old)); VIRTUAL OP* newUNOP _((I32 type, I32 flags, OP* first)); VIRTUAL OP* newWHILEOP _((I32 flags, I32 debuggable, LOOP* loop, @@ -387,7 +395,7 @@ VIRTUAL struct perl_thread * new_struct_thread _((struct perl_thread *t)); #endif VIRTUAL PERL_SI * new_stackinfo _((I32 stitems, I32 cxitems)); VIRTUAL PerlIO* nextargv _((GV* gv)); -VIRTUAL char* ninstr _((char* big, char* bigend, char* little, char* lend)); +VIRTUAL char* ninstr _((const char* big, const char* bigend, const char* little, const char* lend)); VIRTUAL OP* oopsCV _((OP* o)); VIRTUAL void op_free _((OP* arg)); VIRTUAL void package _((OP* o)); @@ -410,9 +418,9 @@ VIRTUAL void perl_atexit _((void(*fn)(CPerlObj *, void *), void* ptr)); #else void perl_atexit _((void(*fn)(void *), void*)); #endif -VIRTUAL I32 perl_call_argv _((char* sub_name, I32 flags, char** argv)); -VIRTUAL I32 perl_call_method _((char* methname, I32 flags)); -VIRTUAL I32 perl_call_pv _((char* sub_name, I32 flags)); +VIRTUAL I32 perl_call_argv _((const char* sub_name, I32 flags, char** argv)); +VIRTUAL I32 perl_call_method _((const char* methname, I32 flags)); +VIRTUAL I32 perl_call_pv _((const char* sub_name, I32 flags)); VIRTUAL I32 perl_call_sv _((SV* sv, I32 flags)); #ifdef PERL_OBJECT VIRTUAL void perl_construct _((void)); @@ -421,22 +429,22 @@ VIRTUAL void perl_destruct _((void)); void perl_construct _((PerlInterpreter* sv_interp)); void perl_destruct _((PerlInterpreter* sv_interp)); #endif -VIRTUAL SV* perl_eval_pv _((char* p, I32 croak_on_error)); +VIRTUAL SV* perl_eval_pv _((const char* p, I32 croak_on_error)); VIRTUAL I32 perl_eval_sv _((SV* sv, I32 flags)); #ifdef PERL_OBJECT VIRTUAL void perl_free _((void)); #else void perl_free _((PerlInterpreter* sv_interp)); #endif -VIRTUAL SV* perl_get_sv _((char* name, I32 create)); -VIRTUAL AV* perl_get_av _((char* name, I32 create)); -VIRTUAL HV* perl_get_hv _((char* name, I32 create)); -VIRTUAL CV* perl_get_cv _((char* name, I32 create)); +VIRTUAL SV* perl_get_sv _((const char* name, I32 create)); +VIRTUAL AV* perl_get_av _((const char* name, I32 create)); +VIRTUAL HV* perl_get_hv _((const char* name, I32 create)); +VIRTUAL CV* perl_get_cv _((const char* name, I32 create)); VIRTUAL int perl_init_i18nl10n _((int printwarn)); VIRTUAL int perl_init_i18nl14n _((int printwarn)); -VIRTUAL void perl_new_collate _((char* newcoll)); -VIRTUAL void perl_new_ctype _((char* newctype)); -VIRTUAL void perl_new_numeric _((char* newcoll)); +VIRTUAL void perl_new_collate _((const char* newcoll)); +VIRTUAL void perl_new_ctype _((const char* newctype)); +VIRTUAL void perl_new_numeric _((const char* newcoll)); VIRTUAL void perl_set_numeric_local _((void)); VIRTUAL void perl_set_numeric_standard _((void)); #ifdef PERL_OBJECT @@ -444,7 +452,7 @@ VIRTUAL int perl_parse _((void(*xsinit)(CPerlObj*), int argc, char** argv, char* #else int perl_parse _((PerlInterpreter* sv_interp, void(*xsinit)(void), int argc, char** argv, char** env)); #endif -VIRTUAL void perl_require_pv _((char* pv)); +VIRTUAL void perl_require_pv _((const char* pv)); #define perl_requirepv perl_require_pv #ifdef PERL_OBJECT VIRTUAL int perl_run _((void)); @@ -471,8 +479,8 @@ VIRTUAL I32 regexec_flags _((regexp* prog, char* stringarg, char* strend, void* data, U32 flags)); VIRTUAL regnode* regnext _((regnode* p)); VIRTUAL void regprop _((SV* sv, regnode* o)); -VIRTUAL void repeatcpy _((char* to, char* from, I32 len, I32 count)); -VIRTUAL char* rninstr _((char* big, char* bigend, char* little, char* lend)); +VIRTUAL void repeatcpy _((char* to, const char* from, I32 len, I32 count)); +VIRTUAL char* rninstr _((const char* big, const char* bigend, const char* little, const char* lend)); VIRTUAL Sighandler_t rsignal _((int i, Sighandler_t t)); VIRTUAL int rsignal_restore _((int i, Sigsave_t* t)); VIRTUAL int rsignal_save _((int i, Sighandler_t t1, Sigsave_t* t2)); @@ -483,10 +491,11 @@ VIRTUAL void rxres_save _((void** rsp, REGEXP* prx)); #ifndef HAS_RENAME VIRTUAL I32 same_dirent _((char* a, char* b)); #endif -VIRTUAL char* savepv _((char* sv)); -VIRTUAL char* savepvn _((char* sv, I32 len)); +VIRTUAL char* savepv _((const char* sv)); +VIRTUAL char* savepvn _((const char* sv, I32 len)); VIRTUAL void savestack_grow _((void)); VIRTUAL void save_aelem _((AV* av, I32 idx, SV **sptr)); +VIRTUAL I32 save_alloc _((I32 size, I32 pad)); VIRTUAL void save_aptr _((AV** aptr)); VIRTUAL AV* save_ary _((GV* gv)); VIRTUAL void save_clearsv _((SV** svp)); @@ -502,6 +511,7 @@ void save_destructor _((void (*f)(void*), void* p)); VIRTUAL void save_freesv _((SV* sv)); VIRTUAL void save_freeop _((OP* o)); VIRTUAL void save_freepv _((char* pv)); +VIRTUAL void save_generic_svref _((SV** sptr)); VIRTUAL void save_gp _((GV* gv, I32 empty)); VIRTUAL HV* save_hash _((GV* gv)); VIRTUAL void save_helem _((HV* hv, SV *key, SV **sptr)); @@ -527,6 +537,7 @@ VIRTUAL OP* scalar _((OP* o)); VIRTUAL OP* scalarkids _((OP* o)); VIRTUAL OP* scalarseq _((OP* o)); VIRTUAL OP* scalarvoid _((OP* o)); +VIRTUAL UV scan_bin _((char* start, I32 len, I32* retlen)); VIRTUAL UV scan_hex _((char* start, I32 len, I32* retlen)); VIRTUAL char* scan_num _((char* s)); VIRTUAL UV scan_oct _((char* start, I32 len, I32* retlen)); @@ -536,8 +547,8 @@ VIRTUAL char* screaminstr _((SV* bigsv, SV* littlesv, I32 start_shift, I32 end_s VIRTUAL I32 setenv_getix _((char* nam)); #endif VIRTUAL void setdefout _((GV* gv)); -VIRTUAL char* sharepvn _((char* sv, I32 len, U32 hash)); -VIRTUAL HEK* share_hek _((char* sv, I32 len, U32 hash)); +VIRTUAL char* sharepvn _((const char* sv, I32 len, U32 hash)); +VIRTUAL HEK* share_hek _((const char* sv, I32 len, U32 hash)); VIRTUAL Signal_t sighandler _((int sig)); VIRTUAL SV** stack_grow _((SV** sp, SV**p, int n)); VIRTUAL I32 start_subparse _((I32 is_format, U32 flags)); @@ -559,13 +570,9 @@ VIRTUAL void sv_add_arena _((char* ptr, U32 size, U32 flags)); VIRTUAL int sv_backoff _((SV* sv)); VIRTUAL SV* sv_bless _((SV* sv, HV* stash)); VIRTUAL void sv_catpvf _((SV* sv, const char* pat, ...)); -VIRTUAL void sv_catpvf_mg _((SV *sv, const char* pat, ...)); -VIRTUAL void sv_catpv _((SV* sv, char* ptr)); -VIRTUAL void sv_catpv_mg _((SV *sv, char *ptr)); -VIRTUAL void sv_catpvn _((SV* sv, char* ptr, STRLEN len)); -VIRTUAL void sv_catpvn_mg _((SV *sv, char *ptr, STRLEN len)); +VIRTUAL void sv_catpv _((SV* sv, const char* ptr)); +VIRTUAL void sv_catpvn _((SV* sv, const char* ptr, STRLEN len)); VIRTUAL void sv_catsv _((SV* dsv, SV* ssv)); -VIRTUAL void sv_catsv_mg _((SV *dstr, SV *sstr)); VIRTUAL void sv_chop _((SV* sv, char* ptr)); VIRTUAL void sv_clean_all _((void)); VIRTUAL void sv_clean_objs _((void)); @@ -578,23 +585,19 @@ VIRTUAL char* sv_collxfrm _((SV* sv, STRLEN* nxp)); VIRTUAL OP* sv_compile_2op _((SV* sv, OP** startp, char* code, AV** avp)); VIRTUAL void sv_dec _((SV* sv)); VIRTUAL void sv_dump _((SV* sv)); -VIRTUAL bool sv_derived_from _((SV* sv, char* name)); +VIRTUAL bool sv_derived_from _((SV* sv, const char* name)); VIRTUAL I32 sv_eq _((SV* sv1, SV* sv2)); VIRTUAL void sv_free _((SV* sv)); VIRTUAL void sv_free_arenas _((void)); VIRTUAL char* sv_gets _((SV* sv, PerlIO* fp, I32 append)); -#ifndef DOSISH -VIRTUAL char* sv_grow _((SV* sv, I32 newlen)); -#else -VIRTUAL char* sv_grow _((SV* sv, unsigned long newlen)); -#endif +VIRTUAL char* sv_grow _((SV* sv, STRLEN newlen)); VIRTUAL void sv_inc _((SV* sv)); VIRTUAL void sv_insert _((SV* bigsv, STRLEN offset, STRLEN len, char* little, STRLEN littlelen)); -VIRTUAL int sv_isa _((SV* sv, char* name)); +VIRTUAL int sv_isa _((SV* sv, const char* name)); VIRTUAL int sv_isobject _((SV* sv)); VIRTUAL STRLEN sv_len _((SV* sv)); VIRTUAL STRLEN sv_len_utf8 _((SV* sv)); -VIRTUAL void sv_magic _((SV* sv, SV* obj, int how, char* name, I32 namlen)); +VIRTUAL void sv_magic _((SV* sv, SV* obj, int how, const char* name, I32 namlen)); VIRTUAL SV* sv_mortalcopy _((SV* oldsv)); VIRTUAL SV* sv_newmortal _((void)); VIRTUAL SV* sv_newref _((SV* sv)); @@ -607,25 +610,17 @@ VIRTUAL void sv_replace _((SV* sv, SV* nsv)); VIRTUAL void sv_report_used _((void)); VIRTUAL void sv_reset _((char* s, HV* stash)); VIRTUAL void sv_setpvf _((SV* sv, const char* pat, ...)); -VIRTUAL void sv_setpvf_mg _((SV *sv, const char* pat, ...)); VIRTUAL void sv_setiv _((SV* sv, IV num)); -VIRTUAL void sv_setiv_mg _((SV *sv, IV i)); VIRTUAL void sv_setpviv _((SV* sv, IV num)); -VIRTUAL void sv_setpviv_mg _((SV *sv, IV iv)); VIRTUAL void sv_setuv _((SV* sv, UV num)); -VIRTUAL void sv_setuv_mg _((SV *sv, UV u)); VIRTUAL void sv_setnv _((SV* sv, double num)); -VIRTUAL void sv_setnv_mg _((SV *sv, double num)); -VIRTUAL SV* sv_setref_iv _((SV* rv, char* classname, IV iv)); -VIRTUAL SV* sv_setref_nv _((SV* rv, char* classname, double nv)); -VIRTUAL SV* sv_setref_pv _((SV* rv, char* classname, void* pv)); -VIRTUAL SV* sv_setref_pvn _((SV* rv, char* classname, char* pv, I32 n)); +VIRTUAL SV* sv_setref_iv _((SV* rv, const char* classname, IV iv)); +VIRTUAL SV* sv_setref_nv _((SV* rv, const char* classname, double nv)); +VIRTUAL SV* sv_setref_pv _((SV* rv, const char* classname, void* pv)); +VIRTUAL SV* sv_setref_pvn _((SV* rv, const char* classname, char* pv, I32 n)); VIRTUAL void sv_setpv _((SV* sv, const char* ptr)); -VIRTUAL void sv_setpv_mg _((SV *sv, const char *ptr)); VIRTUAL void sv_setpvn _((SV* sv, const char* ptr, STRLEN len)); -VIRTUAL void sv_setpvn_mg _((SV *sv, const char *ptr, STRLEN len)); VIRTUAL void sv_setsv _((SV* dsv, SV* ssv)); -VIRTUAL void sv_setsv_mg _((SV *dstr, SV *sstr)); VIRTUAL void sv_taint _((SV* sv)); VIRTUAL bool sv_tainted _((SV* sv)); VIRTUAL int sv_unmagic _((SV* sv, int type)); @@ -633,7 +628,6 @@ VIRTUAL void sv_unref _((SV* sv)); VIRTUAL void sv_untaint _((SV* sv)); VIRTUAL bool sv_upgrade _((SV* sv, U32 mt)); VIRTUAL void sv_usepvn _((SV* sv, char* ptr, STRLEN len)); -VIRTUAL void sv_usepvn_mg _((SV *sv, char *ptr, STRLEN len)); VIRTUAL void sv_vcatpvfn _((SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *used_locale)); @@ -641,44 +635,48 @@ VIRTUAL void sv_vsetpvfn _((SV* sv, const char* pat, STRLEN patlen, va_list* args, SV** svargs, I32 svmax, bool *used_locale)); VIRTUAL SV* swash_init _((char* pkg, char* name, SV* listsv, I32 minbits, I32 none)); -VIRTUAL UV swash_fetch _((SV *sv, unsigned char *ptr)); +VIRTUAL UV swash_fetch _((SV *sv, U8 *ptr)); VIRTUAL void taint_env _((void)); VIRTUAL void taint_proper _((const char* f, char* s)); -VIRTUAL UV to_utf8_lower _((unsigned char *p)); -VIRTUAL UV to_utf8_upper _((unsigned char *p)); -VIRTUAL UV to_utf8_title _((unsigned char *p)); +VIRTUAL UV to_utf8_lower _((U8 *p)); +VIRTUAL UV to_utf8_upper _((U8 *p)); +VIRTUAL UV to_utf8_title _((U8 *p)); #ifdef UNLINK_ALL_VERSIONS VIRTUAL I32 unlnk _((char* f)); #endif #ifdef USE_THREADS VIRTUAL void unlock_condpair _((void* svv)); #endif -VIRTUAL void unsharepvn _((char* sv, I32 len, U32 hash)); +VIRTUAL void unsharepvn _((const char* sv, I32 len, U32 hash)); VIRTUAL void unshare_hek _((HEK* hek)); VIRTUAL void utilize _((int aver, I32 floor, OP* version, OP* id, OP* arg)); VIRTUAL U8* utf16_to_utf8 _((U16* p, U8 *d, I32 bytelen)); VIRTUAL U8* utf16_to_utf8_reversed _((U16* p, U8 *d, I32 bytelen)); -VIRTUAL I32 utf8_distance _((unsigned char *a, unsigned char *b)); -VIRTUAL U8* utf8_hop _((unsigned char *s, I32 off)); -VIRTUAL UV utf8_to_uv _((unsigned char *s, I32* retlen)); -VIRTUAL char* uv_to_utf8 _((unsigned char *d, UV uv)); +VIRTUAL I32 utf8_distance _((U8 *a, U8 *b)); +VIRTUAL U8* utf8_hop _((U8 *s, I32 off)); +VIRTUAL UV utf8_to_uv _((U8 *s, I32* retlen)); +VIRTUAL U8* uv_to_utf8 _((U8 *d, UV uv)); VIRTUAL void vivify_defelem _((SV* sv)); VIRTUAL void vivify_ref _((SV* sv, U32 to_what)); VIRTUAL I32 wait4pid _((int pid, int* statusp, int flags)); VIRTUAL void warn _((const char* pat,...)); +VIRTUAL void warner _((U32 err, const char* pat,...)); VIRTUAL void watch _((char** addr)); VIRTUAL I32 whichsig _((char* sig)); VIRTUAL int yyerror _((char* s)); -VIRTUAL int yylex _((void)); +#ifdef USE_PURE_BISON +# define PERL_YYLEX_PARAM_DECL YYSTYPE *lvalp, int *lcharp +#else +# define PERL_YYLEX_PARAM_DECL void +#endif +VIRTUAL int yylex _((PERL_YYLEX_PARAM_DECL)); VIRTUAL int yyparse _((void)); VIRTUAL int yywarn _((char* s)); -#ifndef MYMALLOC -VIRTUAL Malloc_t safemalloc _((MEM_SIZE nbytes)); -VIRTUAL Malloc_t safecalloc _((MEM_SIZE elements, MEM_SIZE size)); -VIRTUAL Malloc_t saferealloc _((Malloc_t where, MEM_SIZE nbytes)); -VIRTUAL Free_t safefree _((Malloc_t where)); -#endif +VIRTUAL Malloc_t safesysmalloc _((MEM_SIZE nbytes)); +VIRTUAL Malloc_t safesyscalloc _((MEM_SIZE elements, MEM_SIZE size)); +VIRTUAL Malloc_t safesysrealloc _((Malloc_t where, MEM_SIZE nbytes)); +VIRTUAL Free_t safesysfree _((Malloc_t where)); #ifdef LEAKTEST VIRTUAL Malloc_t safexmalloc _((I32 x, MEM_SIZE size)); @@ -695,20 +693,20 @@ VIRTUAL struct perl_vars *Perl_GetVars _((void)); protected: void hsplit _((HV *hv)); void hfreeentries _((HV *hv)); -HE* more_he _((void)); +void more_he _((void)); HE* new_he _((void)); void del_he _((HE *p)); -HEK *save_hek _((char *str, I32 len, U32 hash)); +HEK *save_hek _((const char *str, I32 len, U32 hash)); SV *mess_alloc _((void)); void gv_init_sv _((GV *gv, I32 sv_type)); SV *save_scalar_at _((SV **sptr)); IV asIV _((SV* sv)); UV asUV _((SV* sv)); SV *more_sv _((void)); -XPVIV *more_xiv _((void)); -XPVNV *more_xnv _((void)); -XPV *more_xpv _((void)); -XRV *more_xrv _((void)); +void more_xiv _((void)); +void more_xnv _((void)); +void more_xpv _((void)); +void more_xrv _((void)); XPVIV *new_xiv _((void)); XPVNV *new_xnv _((void)); XPV *new_xpv _((void)); @@ -735,8 +733,9 @@ void visit _((SVFUNC f)); typedef I32 (CPerlObj::*SVCOMPARE) _((SV*, SV*)); void qsortsv _((SV ** array, size_t num_elts, SVCOMPARE f)); I32 sortcv _((SV *a, SV *b)); -void save_magic _((MGS *mgs, SV *sv)); +void save_magic _((I32 mgs_ix, SV *sv)); int magic_methpack _((SV *sv, MAGIC *mg, char *meth)); +int magic_methcall _((SV *sv, MAGIC *mg, char *meth, I32 f, int n, SV *val)); int magic_methcall _((MAGIC *mg, char *meth, I32 flags, int n, SV *val)); OP * doform _((CV *cv, GV *gv, OP *retop)); void doencodes _((SV* sv, char* s, I32 len)); @@ -752,6 +751,13 @@ I32 dopoptosub _((I32 startingblock)); I32 dopoptosub_at _((PERL_CONTEXT* cxstk, I32 startingblock)); void save_lines _((AV *array, SV *sv)); OP *doeval _((int gimme, OP** startop)); +I32 sv_ncmp _((SV *a, SV *b)); +I32 sv_i_ncmp _((SV *a, SV *b)); +I32 amagic_ncmp _((SV *a, SV *b)); +I32 amagic_i_ncmp _((SV *a, SV *b)); +I32 amagic_cmp _((SV *str1, SV *str2)); +I32 amagic_cmp_locale _((SV *str1, SV *str2)); + SV *mul128 _((SV *sv, U8 m)); SV *is_an_int _((char *s, STRLEN l)); int div128 _((SV *pnum, bool *done)); @@ -798,7 +804,7 @@ void depcom _((void)); I32 win32_textfilter _((int idx, SV *sv, int maxlen)); #endif char* incl_perldb _((void)); -SV *isa_lookup _((HV *stash, char *name, int len, int level)); +SV *isa_lookup _((HV *stash, const char *name, int len, int level)); CV *get_db_sub _((SV **svp, CV *cv)); I32 list_assignment _((OP *o)); void bad_type _((I32 n, char *t, char *name, OP *kid)); @@ -808,7 +814,7 @@ OP *scalarboolean _((OP *o)); OP *too_few_arguments _((OP *o, char* name)); OP *too_many_arguments _((OP *o, char* name)); void null _((OP* o)); -PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix)); +PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval)); OP *newDEFSVOP _((void)); char* gv_ename _((GV *gv)); CV *cv_clone2 _((CV *proto, CV *outside)); @@ -832,13 +838,16 @@ void nuke_stacks _((void)); void open_script _((char *, bool, SV *, int *fd)); void usage _((char *)); void validate_suid _((char *, char*, int)); +int emulate_eaccess _((const char* path, int mode)); regnode *reg _((I32, I32 *)); regnode *reganode _((U8, U32)); regnode *regatom _((I32 *)); regnode *regbranch _((I32 *, I32)); void regc _((U8, char *)); +void reguni _((UV, char *, I32*)); regnode *regclass _((void)); +regnode *regclassutf8 _((void)); I32 regcurly _((char *)); regnode *reg_node _((U8)); regnode *regpiece _((I32 *)); @@ -853,13 +862,21 @@ void scan_commit _((scan_data_t *data)); I32 study_chunk _((regnode **scanp, I32 *deltap, regnode *last, scan_data_t *data, U32 flags)); I32 add_data _((I32 n, char *s)); void re_croak2 _((const char* pat1,const char* pat2,...)) __attribute__((noreturn)); +char* regpposixcc _((I32 value)); +void clear_re _((void *r)); I32 regmatch _((regnode *prog)); I32 regrepeat _((regnode *p, I32 max)); I32 regrepeat_hard _((regnode *p, I32 max, I32 *lp)); I32 regtry _((regexp *prog, char *startpos)); bool reginclass _((char *p, I32 c)); +bool reginclassutf8 _((regnode *f, U8* p)); CHECKPOINT regcppush _((I32 parenfloor)); char * regcppop _((void)); +char * regcp_set_to _((I32 ss)); +void cache_re _((regexp *prog)); +void restore_pos _((void *arg)); +U8 * reghop _((U8 *pos, I32 off)); +U8 * reghopmaybe _((U8 *pos, I32 off)); void dump _((char *pat,...)); #ifdef WIN32 int do_aspawn _((void *vreally, void **vmark, void **vsp)); @@ -872,44 +889,28 @@ void debprof _((OP *o)); void *bset_obj_store _((void *obj, I32 ix)); OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp)); +void simplify_sort _((OP *o)); +bool is_handle_constructor _((OP *o, I32 argnum)); -#define PPDEF(s) OP* CPerlObj::s _((ARGSproto)); +I32 do_trans_CC_simple _((SV *sv)); +I32 do_trans_CC_count _((SV *sv)); +I32 do_trans_CC_complex _((SV *sv)); +I32 do_trans_UU_simple _((SV *sv)); +I32 do_trans_UU_count _((SV *sv)); +I32 do_trans_UU_complex _((SV *sv)); +I32 do_trans_UC_simple _((SV *sv)); +I32 do_trans_CU_simple _((SV *sv)); +I32 do_trans_UC_trivial _((SV *sv)); +I32 do_trans_CU_trivial _((SV *sv)); + +#undef PERL_CKDEF +#undef PERL_PPDEF +#define PERL_CKDEF(s) OP* s _((OP *o)); +#define PERL_PPDEF(s) OP* s _((ARGSproto)); public: #include "pp_proto.h" -OP * ck_ftst _((OP *o)); -OP *ck_anoncode _((OP *o)); -OP *ck_bitop _((OP *o)); -OP *ck_concat _((OP *o)); -OP *ck_spair _((OP *o)); -OP *ck_delete _((OP *o)); -OP *ck_eof _((OP *o)); -OP *ck_eval _((OP *o)); -OP *ck_exec _((OP *o)); -OP *ck_exists _((OP *o)); -OP *ck_rvconst _((OP *o)); -OP *ck_fun _((OP *o)); -OP *ck_glob _((OP *o)); -OP *ck_grep _((OP *o)); -OP *ck_index _((OP *o)); -OP *ck_lengthconst _((OP *o)); -OP *ck_lfun _((OP *o)); -OP *ck_rfun _((OP *o)); -OP *ck_listiob _((OP *o)); -OP *ck_fun_locale _((OP *o)); -OP *ck_scmp _((OP *o)); -OP *ck_match _((OP *o)); -OP *ck_null _((OP *o)); -OP *ck_repeat _((OP *o)); -OP *ck_require _((OP *o)); -OP *ck_select _((OP *o)); -OP *ck_shift _((OP *o)); -OP *ck_sort _((OP *o)); -OP *ck_split _((OP *o)); -OP *ck_subr _((OP *o)); -OP *ck_svconst _((OP *o)); -OP *ck_trunc _((OP *o)); void unwind_handler_stack _((void *p)); void restore_magic _((void *p)); void restore_rsfp _((void *f)); @@ -932,3 +933,37 @@ VIRTUAL void byterun _((struct bytestream bs)); VIRTUAL void byterun _((PerlIO *fp)); #endif /* INDIRECT_BGET_MACROS */ +VIRTUAL void sv_catpvf_mg _((SV *sv, const char* pat, ...)); +VIRTUAL void sv_catpv_mg _((SV *sv, const char *ptr)); +VIRTUAL void sv_catpvn_mg _((SV *sv, const char *ptr, STRLEN len)); +VIRTUAL void sv_catsv_mg _((SV *dstr, SV *sstr)); +VIRTUAL void sv_setpvf_mg _((SV *sv, const char* pat, ...)); +VIRTUAL void sv_setiv_mg _((SV *sv, IV i)); +VIRTUAL void sv_setpviv_mg _((SV *sv, IV iv)); +VIRTUAL void sv_setuv_mg _((SV *sv, UV u)); +VIRTUAL void sv_setnv_mg _((SV *sv, double num)); +VIRTUAL void sv_setpv_mg _((SV *sv, const char *ptr)); +VIRTUAL void sv_setpvn_mg _((SV *sv, const char *ptr, STRLEN len)); +VIRTUAL void sv_setsv_mg _((SV *dstr, SV *sstr)); +VIRTUAL void sv_usepvn_mg _((SV *sv, char *ptr, STRLEN len)); + +VIRTUAL MGVTBL* get_vtbl _((int vtbl_id)); + +/* New virtual functions must be added here to maintain binary + * compatablity with PERL_OBJECT + */ + +VIRTUAL char* pv_display _((SV *sv, char *pv, STRLEN cur, STRLEN len, STRLEN pvlim)); +VIRTUAL void dump_indent _((I32 level, PerlIO *file, const char* pat, ...)); + +VIRTUAL void do_gv_dump _((I32 level, PerlIO *file, char *name, GV *sv)); +VIRTUAL void do_gvgv_dump _((I32 level, PerlIO *file, char *name, GV *sv)); +VIRTUAL void do_hv_dump _((I32 level, PerlIO *file, char *name, HV *sv)); +VIRTUAL void do_magic_dump _((I32 level, PerlIO *file, MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)); +VIRTUAL void do_op_dump _((I32 level, PerlIO *file, OP *o)); +VIRTUAL void do_pmop_dump _((I32 level, PerlIO *file, PMOP *pm)); +VIRTUAL void do_sv_dump _((I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)); +VIRTUAL void magic_dump _((MAGIC *mg)); +VIRTUAL void reginitcolors _((void)); +VIRTUAL char* sv_2pv_nolen _((SV* sv)); +VIRTUAL char* sv_pv _((SV *sv));