X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2Fre%2Fre.xs;h=0a90f9f5fa457c5f8f771f9d56291623d5ee18b2;hb=2980942b2f5909e829b4838431ea4ccc49645a4b;hp=31887255a11dfaac92ff09873d3ef27d4ce45c38;hpb=df3728a2a53a64c63edf08a4429a7a57b76ca4aa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/re/re.xs b/ext/re/re.xs
index 3188725..0a90f9f 100644
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,11 +1,13 @@
+#if defined(PERL_EXT_RE_DEBUG) && !defined(DEBUGGING)
+#  define DEBUGGING
+#endif
+
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
-#ifdef WAS_NOT_DEBUGGING
-void Perl_deb(pTHX_ const char* pat, ...) { }
-#endif
+START_EXTERN_C
 
 extern regexp*	my_regcomp (pTHX_ char* exp, char* xend, PMOP* pm);
 extern I32	my_regexec (pTHX_ regexp* prog, char* stringarg, char* strend,
@@ -17,10 +19,34 @@ extern char*	my_re_intuit_start (pTHX_ regexp *prog, SV *sv, char *strpos,
 				    struct re_scream_pos_data_s *data);
 extern SV*	my_re_intuit_string (pTHX_ regexp *prog);
 
+END_EXTERN_C
+
+/* engine details need to be paired - non debugging, debuggin  */
+#define NEEDS_DEBUGGING 0x01
+struct regexp_engine {
+    regexp*	(*regcomp) (pTHX_ char* exp, char* xend, PMOP* pm);
+    I32		(*regexec) (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);
+};
+
+struct regexp_engine engines[] = {
+    { Perl_pregcomp, Perl_regexec_flags, Perl_re_intuit_start,
+      Perl_re_intuit_string, Perl_pregfree },
+    { my_regcomp, my_regexec, my_re_intuit_start, my_re_intuit_string,
+      my_regfree }
+};
+
 #define MY_CXT_KEY "re::_guts" XS_VERSION
 
 typedef struct {
     int		x_oldflag;		/* debug flag */
+    unsigned int x_state;
 } my_cxt_t;
 
 START_MY_CXT
@@ -28,31 +54,40 @@ START_MY_CXT
 #define oldflag		(MY_CXT.x_oldflag)
 
 static void
-uninstall(pTHX)
+install(pTHX_ unsigned int new_state)
 {
     dMY_CXT;
-    PL_regexecp = Perl_regexec_flags;
-    PL_regcompp = Perl_pregcomp;
-    PL_regint_start = Perl_re_intuit_start;
-    PL_regint_string = Perl_re_intuit_string;
-    PL_regfree = Perl_pregfree;
-
-    if (!oldflag)
-	PL_debug &= ~DEBUG_r_FLAG;
-}
+    const unsigned int states 
+	= sizeof(engines) / sizeof(struct regexp_engine) -1;
+    if(new_state == MY_CXT.x_state)
+	return;
 
-static void
-install(pTHX)
-{
-    dMY_CXT;
-    PL_colorset = 0;			/* Allow reinspection of ENV. */
-    PL_regexecp = &my_regexec;
-    PL_regcompp = &my_regcomp;
-    PL_regint_start = &my_re_intuit_start;
-    PL_regint_string = &my_re_intuit_string;
-    PL_regfree = &my_regfree;
-    oldflag = PL_debug & DEBUG_r_FLAG;
-    PL_debug |= DEBUG_r_FLAG;
+    if (new_state > states) {
+	Perl_croak(aTHX_ "panic: re::install state %u is illegal - max is %u",
+		   new_state, states);
+    }
+
+    PL_regexecp = engines[new_state].regexec;
+    PL_regcompp = engines[new_state].regcomp;
+    PL_regint_start = engines[new_state].re_intuit_start;
+    PL_regint_string = engines[new_state].re_intuit_string;
+    PL_regfree = engines[new_state].regfree;
+
+    if (new_state & NEEDS_DEBUGGING) {
+	PL_colorset = 0;	/* Allow reinspection of ENV. */
+	if (!(MY_CXT.x_state & NEEDS_DEBUGGING)) {
+	    /* Debugging is turned on for the first time.  */
+	    oldflag = PL_debug & DEBUG_r_FLAG;
+	    PL_debug |= DEBUG_r_FLAG;
+	}
+    } else {
+	if (!(MY_CXT.x_state & NEEDS_DEBUGGING)) {
+	    if (!oldflag)
+		PL_debug &= ~DEBUG_r_FLAG;
+	}
+    }
+
+    MY_CXT.x_state = new_state;
 }
 
 MODULE = re	PACKAGE = re
@@ -64,11 +99,7 @@ BOOT:
 
 
 void
-install()
-  CODE:
-    install(aTHX);
-
-void
-uninstall()
+install(new_state)
+  unsigned int new_state;
   CODE:
-    uninstall(aTHX);
+    install(aTHX_ new_state);