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

diff --git a/ext/re/re.xs b/ext/re/re.xs
index 10e44f7..0a90f9f 100644
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -1,12 +1,14 @@
-/* We need access to debugger hooks */
-#ifndef DEBUGGING
+#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"
 
+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,
 			    char* strbeg, I32 minend, SV* screamer,
@@ -17,46 +19,87 @@ 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);
 
-static int oldfl;
+END_EXTERN_C
 
-#define R_DB 512
+/* 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);
+};
 
-static void
-deinstall(pTHX)
-{
-    dTHR;
-    PL_regexecp = FUNC_NAME_TO_PTR(Perl_regexec_flags);
-    PL_regcompp = FUNC_NAME_TO_PTR(Perl_pregcomp);
-    PL_regint_start = FUNC_NAME_TO_PTR(Perl_re_intuit_start);
-    PL_regint_string = FUNC_NAME_TO_PTR(Perl_re_intuit_string);
-    PL_regfree = FUNC_NAME_TO_PTR(Perl_pregfree);
-
-    if (!oldfl)
-	PL_debug &= ~R_DB;
-}
+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
+
+#define oldflag		(MY_CXT.x_oldflag)
 
 static void
-install(pTHX)
+install(pTHX_ unsigned int new_state)
 {
-    dTHR;
-    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;
-    oldfl = PL_debug & R_DB;
-    PL_debug |= R_DB;
+    dMY_CXT;
+    const unsigned int states 
+	= sizeof(engines) / sizeof(struct regexp_engine) -1;
+    if(new_state == MY_CXT.x_state)
+	return;
+
+    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
 
-void
-install()
-  CODE:
-    install(aTHX);
+BOOT:
+{
+   MY_CXT_INIT;
+}
+
 
 void
-deinstall()
+install(new_state)
+  unsigned int new_state;
   CODE:
-    deinstall(aTHX);
+    install(aTHX_ new_state);