Save the spot of regprev (see #9911) for binary compatibility;

regen API.

p4raw-id: //depot/perl@9912

diff --git a/embedvar.h b/embedvar.h
index 0cf1136..a77a273 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -99,6 +99,7 @@
 #define PL_regcode             (vTHX->Tregcode)
 #define PL_regcomp_parse       (vTHX->Tregcomp_parse)
 #define PL_regcomp_rx          (vTHX->Tregcomp_rx)
+#define PL_regcompat1          (vTHX->Tregcompat1)
 #define PL_regcompp            (vTHX->Tregcompp)
 #define PL_regdata             (vTHX->Tregdata)
 #define PL_regdummy            (vTHX->Tregdummy)
@@ -117,7 +118,6 @@
 #define PL_regnaughty          (vTHX->Tregnaughty)
 #define PL_regnpar             (vTHX->Tregnpar)
 #define PL_regprecomp          (vTHX->Tregprecomp)
-#define PL_regprev             (vTHX->Tregprev)
 #define PL_regprogram          (vTHX->Tregprogram)
 #define PL_regsawback          (vTHX->Tregsawback)
 #define PL_regseen             (vTHX->Tregseen)
@@ -807,6 +807,7 @@
 #define PL_regcode             (aTHXo->interp.Tregcode)
 #define PL_regcomp_parse       (aTHXo->interp.Tregcomp_parse)
 #define PL_regcomp_rx          (aTHXo->interp.Tregcomp_rx)
+#define PL_regcompat1          (aTHXo->interp.Tregcompat1)
 #define PL_regcompp            (aTHXo->interp.Tregcompp)
 #define PL_regdata             (aTHXo->interp.Tregdata)
 #define PL_regdummy            (aTHXo->interp.Tregdummy)
@@ -825,7 +826,6 @@
 #define PL_regnaughty          (aTHXo->interp.Tregnaughty)
 #define PL_regnpar             (aTHXo->interp.Tregnpar)
 #define PL_regprecomp          (aTHXo->interp.Tregprecomp)
-#define PL_regprev             (aTHXo->interp.Tregprev)
 #define PL_regprogram          (aTHXo->interp.Tregprogram)
 #define PL_regsawback          (aTHXo->interp.Tregsawback)
 #define PL_regseen             (aTHXo->interp.Tregseen)
@@ -1504,6 +1504,7 @@
 #define PL_regcode             (aTHX->Tregcode)
 #define PL_regcomp_parse       (aTHX->Tregcomp_parse)
 #define PL_regcomp_rx          (aTHX->Tregcomp_rx)
+#define PL_regcompat1          (aTHX->Tregcompat1)
 #define PL_regcompp            (aTHX->Tregcompp)
 #define PL_regdata             (aTHX->Tregdata)
 #define PL_regdummy            (aTHX->Tregdummy)
@@ -1522,7 +1523,6 @@
 #define PL_regnaughty          (aTHX->Tregnaughty)
 #define PL_regnpar             (aTHX->Tregnpar)
 #define PL_regprecomp          (aTHX->Tregprecomp)
-#define PL_regprev             (aTHX->Tregprev)
 #define PL_regprogram          (aTHX->Tregprogram)
 #define PL_regsawback          (aTHX->Tregsawback)
 #define PL_regseen             (aTHX->Tregseen)
@@ -1640,6 +1640,7 @@
 #define PL_Tregcode            PL_regcode
 #define PL_Tregcomp_parse      PL_regcomp_parse
 #define PL_Tregcomp_rx         PL_regcomp_rx
+#define PL_Tregcompat1         PL_regcompat1
 #define PL_Tregcompp           PL_regcompp
 #define PL_Tregdata            PL_regdata
 #define PL_Tregdummy           PL_regdummy
@@ -1658,7 +1659,6 @@
 #define PL_Tregnaughty         PL_regnaughty
 #define PL_Tregnpar            PL_regnpar
 #define PL_Tregprecomp         PL_regprecomp
-#define PL_Tregprev            PL_regprev
 #define PL_Tregprogram         PL_regprogram
 #define PL_Tregsawback         PL_regsawback
 #define PL_Tregseen            PL_regseen

diff --git a/perlapi.h b/perlapi.h
index b066a76..7085e74 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -774,6 +774,8 @@ START_EXTERN_C
 #define PL_regcomp_parse       (*Perl_Tregcomp_parse_ptr(aTHXo))
 #undef  PL_regcomp_rx
 #define PL_regcomp_rx          (*Perl_Tregcomp_rx_ptr(aTHXo))
+#undef  PL_regcompat1
+#define PL_regcompat1          (*Perl_Tregcompat1_ptr(aTHXo))
 #undef  PL_regcompp
 #define PL_regcompp            (*Perl_Tregcompp_ptr(aTHXo))
 #undef  PL_regdata
@@ -810,8 +812,6 @@ START_EXTERN_C
 #define PL_regnpar             (*Perl_Tregnpar_ptr(aTHXo))
 #undef  PL_regprecomp
 #define PL_regprecomp          (*Perl_Tregprecomp_ptr(aTHXo))
-#undef  PL_regprev
-#define PL_regprev             (*Perl_Tregprev_ptr(aTHXo))
 #undef  PL_regprogram
 #define PL_regprogram          (*Perl_Tregprogram_ptr(aTHXo))
 #undef  PL_regsawback

diff --git a/thrdvar.h b/thrdvar.h
index 6c48da9..2cfbfa2 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -183,6 +183,7 @@ PERLVAR(Tregstartp, I32 *)          /* Pointer to startp array. */
 PERLVAR(Tregendp,      I32 *)          /* Ditto for endp. */
 PERLVAR(Treglastparen, U32 *)          /* Similarly for lastparen. */
 PERLVAR(Tregtill,      char *)         /* How far we are required to go. */
+PERLVAR(Tregcompat1,   char)           /* used to be regprev1 */
 PERLVAR(Treg_start_tmp,        char **)        /* from regexec.c */
 PERLVAR(Treg_start_tmpl,U32)           /* from regexec.c */
 PERLVAR(Tregdata,      struct reg_data *)