X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=f91e80bc5b22928cef5069145e1e5c1683e8d1d5;hb=469bf43793110471bf2ceb5e99f0e9cc630d60fe;hp=4c20aba84634c94e8830bab08d8013c47b0b0d91;hpb=dc9e4912b3381e3548a35c5aba633cc37261d318;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/proto.h b/proto.h
index 4c20aba..f91e80b 100644
--- a/proto.h
+++ b/proto.h
@@ -137,12 +137,12 @@ 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));
@@ -361,7 +361,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));
@@ -541,6 +541,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));
@@ -676,12 +677,10 @@ 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));
@@ -756,6 +755,10 @@ 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));
 
@@ -863,6 +866,8 @@ 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));
@@ -873,6 +878,7 @@ 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,...));
@@ -887,6 +893,7 @@ 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));
 
 I32 do_trans_CC_simple _((SV *sv));
 I32 do_trans_CC_count _((SV *sv));
@@ -949,3 +956,15 @@ VIRTUAL MGVTBL*	get_vtbl _((int vtbl_id));
  * 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));