Re: [PATCH] Add hook for re_dup() into regex engine as reg_dupe (make re pluggable under threads)

Message-ID: <9b18b3110609290757n62b3484i7bb948f965524191@mail.gmail.com>

p4raw-id: //depot/perl@28902

1 files changed, 9 insertions, 9 deletions

diff --git a/regexp.h b/regexp.h
index 09759fad3a..99973c1844 100644
--- a/regexp.h
+++ b/regexp.h
@@ -66,17 +66,17 @@ typedef struct re_scream_pos_data_s
 } re_scream_pos_data;
 
 typedef struct regexp_engine {
-    regexp*	(*regcomp) (pTHX_ char* exp, char* xend, PMOP* pm);
-    I32		(*regexec) (pTHX_ regexp* prog, char* stringarg, char* strend,
+    regexp* (*comp) (pTHX_ char* exp, char* xend, PMOP* pm);
+    I32	    (*exec) (pTHX_ regexp* prog, char* stringarg, char* strend,
 			    char* strbeg, I32 minend, SV* screamer,
 			    void* data, U32 flags);
-    char*	(*re_intuit_start) (pTHX_ regexp *prog, SV *sv, char *strpos,
-				    char *strend, U32 flags,
-				    struct re_scream_pos_data_s *data);
-    SV*		(*re_intuit_string) (pTHX_ regexp *prog);
-    void	(*regfree) (pTHX_ struct regexp* r);
-#if defined(USE_ITHREADS)
-    regexp*	(*regdupe) (pTHX_ const regexp *r, CLONE_PARAMS *param);
+    char*   (*intuit) (pTHX_ regexp *prog, SV *sv, char *strpos,
+			    char *strend, U32 flags,
+			    struct re_scream_pos_data_s *data);
+    SV*	    (*checkstr) (pTHX_ regexp *prog);
+    void    (*free) (pTHX_ struct regexp* r);
+#ifdef USE_ITHREADS
+    regexp* (*dupe) (pTHX_ const regexp *r, CLONE_PARAMS *param);
 #endif    
 } regexp_engine;