X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=proto.h;h=1bcb5cdd9105170cbbe5f9f2b32a96af9c9be8d9;hb=777d2cf58fa8e7c971ce9115520838a43768a81d;hp=c9e42db5293611ba52088bf4bbc9b0d31f2f1f9f;hpb=16b7a9a47be196cb33bf757faad24e73ceffc2fc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/proto.h b/proto.h
index c9e42db..1bcb5cd 100644
--- a/proto.h
+++ b/proto.h
@@ -58,6 +58,7 @@ START_EXTERN_C
 #  include "pp_proto.h"
 PERL_CALLCONV SV*	Perl_amagic_call(pTHX_ SV* left, SV* right, int method, int dir);
 PERL_CALLCONV bool	Perl_Gv_AMupdate(pTHX_ HV* stash);
+PERL_CALLCONV CV*	Perl_gv_handler(pTHX_ HV* stash, I32 id);
 PERL_CALLCONV OP*	Perl_append_elem(pTHX_ I32 optype, OP* head, OP* tail);
 PERL_CALLCONV OP*	Perl_append_list(pTHX_ I32 optype, LISTOP* first, LISTOP* last);
 PERL_CALLCONV I32	Perl_apply(pTHX_ I32 type, SV** mark, SV** sp);
@@ -615,6 +616,7 @@ PERL_CALLCONV void	Perl_push_scope(pTHX);
 PERL_CALLCONV OP*	Perl_ref(pTHX_ OP* o, I32 type);
 PERL_CALLCONV OP*	Perl_refkids(pTHX_ OP* o, I32 type);
 PERL_CALLCONV void	Perl_regdump(pTHX_ regexp* r);
+PERL_CALLCONV SV*	Perl_regclass_swash(pTHX_ struct regnode *n, bool doinit, SV **initsvp);
 PERL_CALLCONV I32	Perl_pregexec(pTHX_ regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave);
 PERL_CALLCONV void	Perl_pregfree(pTHX_ struct regexp* r);
 PERL_CALLCONV regexp*	Perl_pregcomp(pTHX_ char* exp, char* xend, PMOP* pm);
@@ -1110,7 +1112,6 @@ STATIC regnode*	S_regatom(pTHX_ struct RExC_state_t*, I32 *);
 STATIC regnode*	S_regbranch(pTHX_ struct RExC_state_t*, I32 *, I32);
 STATIC void	S_reguni(pTHX_ struct RExC_state_t*, UV, char *, STRLEN*);
 STATIC regnode*	S_regclass(pTHX_ struct RExC_state_t*);
-STATIC regnode*	S_regclassutf8(pTHX_ struct RExC_state_t*);
 STATIC I32	S_regcurly(pTHX_ char *);
 STATIC regnode*	S_reg_node(pTHX_ struct RExC_state_t*, U8);
 STATIC regnode*	S_regpiece(pTHX_ struct RExC_state_t*, I32 *);
@@ -1140,8 +1141,7 @@ STATIC I32	S_regmatch(pTHX_ regnode *prog);
 STATIC I32	S_regrepeat(pTHX_ regnode *p, I32 max);
 STATIC I32	S_regrepeat_hard(pTHX_ regnode *p, I32 max, I32 *lp);
 STATIC I32	S_regtry(pTHX_ regexp *prog, char *startpos);
-STATIC bool	S_reginclass(pTHX_ regnode *p, I32 c);
-STATIC bool	S_reginclassutf8(pTHX_ regnode *f, U8* p);
+STATIC bool	S_reginclass(pTHX_ regnode *n, U8 *p, bool do_utf8sv_is_utf8);
 STATIC CHECKPOINT	S_regcppush(pTHX_ I32 parenfloor);
 STATIC char*	S_regcppop(pTHX);
 STATIC char*	S_regcp_set_to(pTHX_ I32 ss);