X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=933942f0054bd1a59004eb487322efcbdfc2da16;hb=e4d48cc9bddb8984cf12bdfbcbac9580d192b5a5;hp=f984290b57db7d36badc05580156005aaa9cf92c;hpb=3666098248b43282bda1153dae2f4c1e4af38d09;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/proto.h b/proto.h
index f984290..933942f 100644
--- a/proto.h
+++ b/proto.h
@@ -1,11 +1,4 @@
 #ifdef PERL_OBJECT
-#include "ipstdio.h"
-#include "ipdir.h"
-#include "ipenv.h"
-#include "iplio.h"
-#include "ipmem.h"
-#include "ipproc.h"
-#include "ipsock.h"
 #define VIRTUAL virtual
 #else
 #define VIRTUAL
@@ -28,19 +21,11 @@ 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));
 VIRTUAL void	assertref _((OP* o));
-VIRTUAL SV*	avhv_delete _((AV *ar, char* key, U32 klen, I32 flags));
-VIRTUAL SV*	avhv_delete_ent _((AV *ar, SV* keysv, I32 flags, U32 hash));
-VIRTUAL bool	avhv_exists _((AV *ar, char* key, U32 klen));
 VIRTUAL bool	avhv_exists_ent _((AV *ar, SV* keysv, U32 hash));
-VIRTUAL SV**	avhv_fetch _((AV *ar, char* key, U32 klen, I32 lval));
 VIRTUAL SV**	avhv_fetch_ent _((AV *ar, SV* keysv, I32 lval, U32 hash));
-VIRTUAL I32	avhv_iterinit _((AV *ar));
 VIRTUAL HE*	avhv_iternext _((AV *ar));
-VIRTUAL SV *	avhv_iternextsv _((AV *ar, char** key, I32* retlen));
 VIRTUAL SV*	avhv_iterval _((AV *ar, HE* entry));
 VIRTUAL HV*	avhv_keys _((AV *ar));
-VIRTUAL SV**	avhv_store _((AV *ar, char* key, U32 klen, SV* val, U32 hash));
-VIRTUAL SV**	avhv_store_ent _((AV *av, SV *keysv, SV *val, U32 hash));
 VIRTUAL void	av_clear _((AV* ar));
 VIRTUAL void	av_extend _((AV* ar, I32 key));
 VIRTUAL AV*	av_fake _((I32 size, SV** svp));
@@ -78,10 +63,9 @@ VIRTUAL void	croak _((const char* pat,...)) __attribute__((noreturn));
 VIRTUAL void	cv_ckproto _((CV* cv, GV* gv, char* p));
 VIRTUAL CV*	cv_clone _((CV* proto));
 VIRTUAL SV*	cv_const_sv _((CV* cv));
+VIRTUAL SV*	op_const_sv _((OP* o, CV* cv));
 VIRTUAL void	cv_undef _((CV* cv));
-#ifdef DEBUGGING
-void	cx_dump _((PERL_CONTEXT* cs));
-#endif
+VIRTUAL void	cx_dump _((PERL_CONTEXT* cs));
 VIRTUAL SV*	filter_add _((filter_t funcp, SV* datasv));
 VIRTUAL void	filter_del _((filter_t funcp));
 VIRTUAL I32	filter_read _((int idx, SV* buffer, int maxlen));
@@ -90,24 +74,12 @@ VIRTUAL char **	get_op_names _((void));
 VIRTUAL char *	get_no_modify _((void));
 VIRTUAL U32 *	get_opargs _((void));
 VIRTUAL I32	cxinc _((void));
-#ifdef DEBUGGING
 VIRTUAL void	deb _((const char* pat,...)) __attribute__((format(printf,1,2)));
 VIRTUAL void	deb_growlevel _((void));
 VIRTUAL void	debprofdump _((void));
 VIRTUAL I32	debop _((OP* o));
 VIRTUAL I32	debstack _((void));
 VIRTUAL I32	debstackptrs _((void));
-#else
-#ifdef PERL_OBJECT
-/* create a matching set of virtual entries for the non debugging version */
-VIRTUAL void	deb_place_holder _((const char* pat,...));
-VIRTUAL void	deb_growlevel_place_holder _((void));
-VIRTUAL void	debprofdump_place_holder _((void));
-VIRTUAL I32	debop_place_holder _((OP* o));
-VIRTUAL I32	debstack_place_holder _((void));
-VIRTUAL I32	debstackptrs_place_holder _((void));
-#endif
-#endif
 VIRTUAL char*	delimcpy _((char* to, char* toend, char* from, char* fromend,
 		    int delim, I32* retlen));
 VIRTUAL void	deprecate _((char* s));
@@ -150,23 +122,21 @@ VIRTUAL void	do_vecset _((SV* sv));
 VIRTUAL void	do_vop _((I32 optype, SV* sv, SV* left, SV* right));
 VIRTUAL I32	dowantarray _((void));
 VIRTUAL void	dump_all _((void));
-#ifdef DEBUGGING
-void	dump_eval _((void));
-#endif
+VIRTUAL void	dump_eval _((void));
 #ifdef DUMP_FDS  /* See util.c */
-int	dump_fds _((char* s));
+VIRTUAL void	dump_fds _((char* s));
 #endif
-void	dump_form _((GV* gv));
-void	dump_gv _((GV* gv));
+VIRTUAL void	dump_form _((GV* gv));
+VIRTUAL void	dump_gv _((GV* gv));
 #ifdef MYMALLOC
-void	dump_mstats _((char* s));
+VIRTUAL void	dump_mstats _((char* s));
 #endif
-void	dump_op _((OP* arg));
-void	dump_pm _((PMOP* pm));
-void	dump_packsubs _((HV* stash));
-void	dump_sub _((GV* gv));
+VIRTUAL void	dump_op _((OP* arg));
+VIRTUAL void	dump_pm _((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));
+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));
@@ -287,6 +257,9 @@ VIRTUAL U32	magic_sizepack	_((SV* sv, MAGIC* mg));
 VIRTUAL int	magic_wipepack	_((SV* sv, MAGIC* mg));
 VIRTUAL void	magicname _((char* sym, char* name, I32 namlen));
 int	main _((int argc, char** argv, char** env));
+#ifdef MYMALLOC
+VIRTUAL MEM_SIZE	malloced_size _((void *p));
+#endif
 VIRTUAL void	markstack_grow _((void));
 #ifdef USE_LOCALE_COLLATE
 VIRTUAL char*	mem_collxfrm _((const char* s, STRLEN len, STRLEN* xlen));
@@ -314,10 +287,10 @@ 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)
-I32	my_memcmp _((char* s1, char* s2, I32 len));
+VIRTUAL I32	my_memcmp _((char* s1, char* s2, I32 len));
 #endif
 #if !defined(HAS_MEMSET)
-void*	my_memset _((char* loc, I32 ch, I32 len));
+VIRTUAL void*	my_memset _((char* loc, I32 ch, I32 len));
 #endif
 #ifndef PERL_OBJECT
 VIRTUAL I32	my_pclose _((PerlIO* ptr));
@@ -359,20 +332,20 @@ VIRTUAL GV*	newGVgen _((char* pack));
 VIRTUAL OP*	newGVREF _((I32 type, OP* o));
 VIRTUAL OP*	newHVREF _((OP* o));
 VIRTUAL HV*	newHV _((void));
+VIRTUAL HV*	newHVhv _((HV* hv));
 VIRTUAL IO*	newIO _((void));
 VIRTUAL OP*	newLISTOP _((I32 type, I32 flags, OP* first, OP* last));
 VIRTUAL OP*	newPMOP _((I32 type, I32 flags));
 VIRTUAL OP*	newPVOP _((I32 type, I32 flags, char* pv));
 VIRTUAL SV*	newRV _((SV* pref));
-#if !defined(__GNUC__) && (defined(CRIPPLED_CC) || defined(USE_THREADS) || defined(PERL_OBJECT))
 VIRTUAL SV*	newRV_noinc _((SV *sv));
-#endif
 VIRTUAL SV*	newSV _((STRLEN len));
 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*	newSVpvf _((const char* pat, ...));
 VIRTUAL SV*	newSVrv _((SV* rv, char* classname));
 VIRTUAL SV*	newSVsv _((SV* old));
@@ -402,7 +375,11 @@ VIRTUAL void	peep _((OP* o));
 #ifndef PERL_OBJECT
 PerlInterpreter*	perl_alloc _((void));
 #endif
-VIRTUAL void    perl_atexit _((void(*fn)(void *), void*));
+#ifdef PERL_OBJECT
+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));
@@ -456,16 +433,12 @@ VIRTUAL void	push_scope _((void));
 VIRTUAL regexp*	pregcomp _((char* exp, char* xend, PMOP* pm));
 VIRTUAL OP*	ref _((OP* o, I32 type));
 VIRTUAL OP*	refkids _((OP* o, I32 type));
-#ifdef DEBUGGING
-void	regdump _((regexp* r));
-#endif
+VIRTUAL void	regdump _((regexp* r));
 VIRTUAL I32	pregexec _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave));
 VIRTUAL I32	regexec_flags _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, void* data, U32 flags));
 VIRTUAL void	pregfree _((struct regexp* r));
 VIRTUAL regnode* regnext _((regnode* p));
-#ifdef DEBUGGING
-void	regprop _((SV* sv, regnode* o));
-#endif
+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 Sighandler_t rsignal _((int i, Sighandler_t t));
@@ -500,6 +473,7 @@ VIRTUAL void	save_freepv _((char* pv));
 VIRTUAL void	save_gp _((GV* gv, I32 empty));
 VIRTUAL HV*	save_hash _((GV* gv));
 VIRTUAL void	save_helem _((HV* hv, SV *key, SV **sptr));
+VIRTUAL void	save_hints _((void));
 VIRTUAL void	save_hptr _((HV** hptr));
 VIRTUAL void	save_I16 _((I16* intp));
 VIRTUAL void	save_I32 _((I32* intp));
@@ -586,9 +560,7 @@ VIRTUAL void	sv_magic _((SV* sv, SV* obj, int how, char* name, I32 namlen));
 VIRTUAL SV*	sv_mortalcopy _((SV* oldsv));
 VIRTUAL SV*	sv_newmortal _((void));
 VIRTUAL SV*	sv_newref _((SV* sv));
-#ifdef DEBUGGING
-char*	sv_peek _((SV* sv));
-#endif
+VIRTUAL char*	sv_peek _((SV* sv));
 VIRTUAL char*	sv_pvn_force _((SV* sv, STRLEN* lp));
 VIRTUAL char*	sv_reftype _((SV* sv, int ob));
 VIRTUAL void	sv_replace _((SV* sv, SV* nsv));
@@ -634,9 +606,7 @@ 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,...));
-#ifdef DEBUGGING
-void	watch _((char** addr));
-#endif
+VIRTUAL void	watch _((char** addr));
 VIRTUAL I32	whichsig _((char* sig));
 VIRTUAL int	yyerror _((char* s));
 VIRTUAL int	yylex _((void));
@@ -690,8 +660,7 @@ void del_xrv _((XRV* p));
 void sv_mortalgrow _((void));
 void sv_unglob _((SV* sv));
 void sv_check_thinkfirst _((SV *sv));
-
-SV *newSVpvn _((char *s, STRLEN len));
+I32 avhv_index_sv _((SV* sv));
 
 void sv_catpv_mg _((SV *sv, char *ptr));
 void sv_catpvf_mg _((SV *sv, const char* pat, ...));
@@ -741,9 +710,7 @@ SV *is_an_int _((char *s, STRLEN l));
 int div128 _((SV *pnum, bool *done));
 
 int runops_standard _((void));
-#ifdef DEBUGGING
 int runops_debug _((void));
-#endif
 void check_uni _((void));
 void  force_next _((I32 type));
 char *force_version _((char *start));
@@ -776,6 +743,7 @@ I32 sublex_start _((void));
 int uni _((I32 f, char *s));
 #endif
 char * filter_gets _((SV *sv, PerlIO *fp, STRLEN append));
+SV *new_constant _((char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type));
 int ao _((int toketype));
 void depcom _((void));
 #ifdef WIN32
@@ -800,6 +768,7 @@ CV *cv_clone2 _((CV *proto, CV *outside));
 void find_beginning _((void));
 void forbid_setid _((char *));
 void incpush _((char *, int));
+void init_interp _((void));
 void init_ids _((void));
 void init_debugger _((void));
 void init_lexer _((void));
@@ -829,6 +798,7 @@ void reginsert _((U8, regnode *));
 void regoptail _((regnode *, regnode *));
 void regset _((char *, I32));
 void regtail _((regnode *, regnode *));
+char* regwhite _((char *, char *));
 char* nextchar _((void));
 regnode *dumpuntil _((regnode *start, regnode *node, regnode *last, SV* sv, I32 l));
 void scan_commit _((scan_data_t *data));
@@ -849,19 +819,14 @@ int do_aspawn _((void *vreally, void **vmark, void **vsp));
 
 #ifdef DEBUGGING
 void del_sv _((SV *p));
-void debprof _((OP *o));
 #endif
+void debprof _((OP *o));
 
 void *bset_obj_store _((void *obj, I32 ix));
 OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp));
 
 #define PPDEF(s) OP* CPerlObj::s _((ARGSproto));
 public:
-#ifdef INDIRECT_BGET_MACROS
-VIRTUAL void byterun _((struct bytestream bs));
-#else
-VIRTUAL void byterun _((PerlIO *fp));
-#endif /* INDIRECT_BGET_MACROS */
 
 PPDEF(pp_aassign)
 PPDEF(pp_abs)
@@ -1240,6 +1205,7 @@ OP *ck_sort _((OP *o));
 OP *ck_split _((OP *o));
 OP *ck_subr _((OP *o));
 OP *ck_svconst _((OP *o));
+OP *ck_sysread _((OP *o));
 OP *ck_trunc _((OP *o));
 void unwind_handler_stack _((void *p));
 void restore_magic _((void *p));
@@ -1248,6 +1214,7 @@ void restore_expect _((void *e));
 void restore_lex_expect _((void *e));
 void yydestruct _((void *ptr));
 VIRTUAL int fprintf _((PerlIO *pf, const char *pat, ...));
+VIRTUAL SV**	get_specialsv_list _((void));
 
 #ifdef WIN32
 VIRTUAL int&	ErrorNo _((void));
@@ -1256,3 +1223,9 @@ VIRTUAL int&	ErrorNo _((void));
 END_EXTERN_C
 #endif	/* PERL_OBJECT */
 
+#ifdef INDIRECT_BGET_MACROS
+VIRTUAL void byterun _((struct bytestream bs));
+#else
+VIRTUAL void byterun _((PerlIO *fp));
+#endif /* INDIRECT_BGET_MACROS */
+