Rename *comp* (resp. *exec*) to *comp_node* (resp. *exec_node*)

For future consistency.

diff --git a/Hooks.xs b/Hooks.xs
index b312223c08fff684b75445b2a1940a2731d85af7..10a68daa331d831b1c6df2f6e7afb0bfa0dc6e56 100644 (file)
--- a/Hooks.xs
+++ b/Hooks.xs
@@ -298,12 +298,12 @@ void reh_call_comp_begin_hook(pTHX_ regexp *rx) {
  }
 }
 
-void reh_call_comp_hook(pTHX_ regexp *rx, regnode *node) {
- REH_PRIVATE_MAP_FOREACH(cbs->comp(aTHX_ rx, node));
+void reh_call_comp_node_hook(pTHX_ regexp *rx, regnode *node) {
+ REH_PRIVATE_MAP_FOREACH(cbs->comp_node(aTHX_ rx, node));
 }
 
-void reh_call_exec_hook(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
- REH_PRIVATE_MAP_FOREACH(cbs->exec(aTHX_ rx, node, reginfo, st));
+void reh_call_exec_node_hook(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
+ REH_PRIVATE_MAP_FOREACH(cbs->exec_node(aTHX_ rx, node, reginfo, st));
 }
 
 void reh_re_free(pTHX_ REGEXP * const RX) {

diff --git a/lib/re/engine/Hooks.pm b/lib/re/engine/Hooks.pm
index 43683e5dc123d4f5d3cb06c85586d1ca00385f19..97da688e29e21f3c1e1e2a61ef7927eea2a1dad5 100644 (file)
--- a/lib/re/engine/Hooks.pm
+++ b/lib/re/engine/Hooks.pm
@@ -32,7 +32,7 @@ In your XS file :
 
     #include "re_engine_hooks.h"
 
-    STATIC void dri_comp_hook(pTHX_ regexp *rx, regnode *node) {
+    STATIC void dri_comp_node_hook(pTHX_ regexp *rx, regnode *node) {
      ...
     }
 
@@ -46,8 +46,8 @@ In your XS file :
     BOOT:
     {
      reh_config cfg;
-     cfg.comp = dri_comp_hook;
-     cfg.exec = dri_exec_hook;
+     cfg.comp_node = dri_comp_node_hook;
+     cfg.exec_node = dri_exec_node_hook;
      reh_register("Devel::Regexp::Instrument", &cfg);
     }
 
@@ -96,19 +96,19 @@ This module provides a version of the perl regexp engine that can call user-defi
 
 The C API is made available through the F<re_engine_hooks.h> header file.
 
-=head2 C<reh_comp_hook>
+=head2 C<reh_comp_node_hook>
 
-The typedef for the regexp compilation phase hook.
+The typedef for the regexp node compilation phase hook.
 Currently evaluates to :
 
-    typedef void (*reh_comp_hook)(pTHX_ regexp *, regnode *);
+    typedef void (*reh_comp_node_hook)(pTHX_ regexp *, regnode *);
 
 =head2 C<reh_exec_hook>
 
-The typedef for the regexp execution phase hook.
+The typedef for the regexp node_execution phase hook.
 Currently evaluates to :
 
-    typedef void (*reh_exec_hook)(pTHX_ regexp *, regnode *, regmatch_info *, regmatch_state *);
+    typedef void (*reh_exec_node_hook)(pTHX_ regexp *, regnode *, regmatch_info *, regmatch_state *);
 
 =head2 C<reh_config>
 
@@ -119,16 +119,16 @@ It has the following members :
 
 =item *
 
-C<comp>
+C<comp_node>
 
-A function pointer of type C<reh_comp_hook> that will be called each time a regnode is compiled.
+A function pointer of type C<reh_comp_node_hook> that will be called each time a regnode is compiled.
 Allowed to be C<NULL> if you don't want to call anything for this phase.
 
 =item *
 
-C<exec>
+C<exec_node>
 
-A function pointer of type C<reh_exec_hook> that will be called each time a regnode is executed.
+A function pointer of type C<reh_exec_node_hook> that will be called each time a regnode is executed.
 Allowed to be C<NULL> if you don't want to call anything for this phase.
 
 =back

diff --git a/re_defs.h b/re_defs.h
index f9510b8d216e01e820ef4b02ad618b2caaf4f0fc..b9e1ac2536ce05ba688b2e03a0c276833b411558 100644 (file)
--- a/re_defs.h
+++ b/re_defs.h
@@ -2,7 +2,7 @@ EXTERN_C void reh_call_comp_begin_hook(pTHX_ regexp *);
 EXTERN_C void reh_call_comp_hook(pTHX_ regexp *, regnode *);
 EXTERN_C void reh_call_exec_hook(pTHX_ regexp *, regnode *, regmatch_info *, regmatch_state *);
 
-#define REH_CALL_COMP_BEGIN_HOOK(a)       reh_call_comp_begin_hook(aTHX_ (a))
-#define REH_CALL_REGCOMP_HOOK(a, b)       reh_call_comp_hook(aTHX_ (a), (b))
-#define REH_CALL_REGEXEC_HOOK(a, b, c, d) reh_call_exec_hook(aTHX_ (a), (b), (c), (d))
+#define REH_CALL_COMP_BEGIN_HOOK(a)         reh_call_comp_begin_hook(aTHX_ (a))
+#define REH_CALL_COMP_NODE_HOOK(a, b)       reh_call_comp_node_hook(aTHX_ (a), (b))
+#define REH_CALL_EXEC_NODE_HOOK(a, b, c, d) reh_call_exec_node_hook(aTHX_ (a), (b), (c), (d))
 

diff --git a/re_engine_hooks.h b/re_engine_hooks.h
index 3613490d7e155f0c2a355a089d09d987698d701a..671c9a890d6dfc2ce481f50f655f22094487250a 100644 (file)
--- a/re_engine_hooks.h
+++ b/re_engine_hooks.h
@@ -4,12 +4,12 @@
 #ifndef RE_ENGINE_HOOKS_H
 #define RE_ENGINE_HOOKS_H 1
 
-typedef void (*reh_comp_hook)(pTHX_ regexp *, regnode *);
-typedef void (*reh_exec_hook)(pTHX_ regexp *, regnode *, regmatch_info *, regmatch_state *);
+typedef void (*reh_comp_node_hook)(pTHX_ regexp *, regnode *);
+typedef void (*reh_exec_node_hook)(pTHX_ regexp *, regnode *, regmatch_info *, regmatch_state *);
 
 typedef struct {
- reh_comp_hook comp;
- reh_exec_hook exec;
+ reh_comp_node_hook comp_node;
+ reh_exec_node_hook exec_node;
 } reh_config;
 
 void reh_register(pTHX_ const char *, reh_config *);

diff --git a/src/5010001/regcomp.c b/src/5010001/regcomp.c
index ccbe60edd86e885536cc2310258fb10d4015cbfb..924c7f884f8fffcf07d799a54a851a669e26e66e 100644 (file)
--- a/src/5010001/regcomp.c
+++ b/src/5010001/regcomp.c
@@ -8537,7 +8537,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8593,7 +8593,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8710,7 +8710,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5010001/regexec.c b/src/5010001/regexec.c
index 66547f5913d51a56c990a1806b7dcfb4164e6fcd..618346d63e11e894e0f38ca2ee45acf4de9b4db3 100644 (file)
--- a/src/5010001/regexec.c
+++ b/src/5010001/regexec.c
@@ -2837,7 +2837,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011000/regcomp.c b/src/5011000/regcomp.c
index 497219f4653e19f7f23ad588c8e743ade8047405..c5edf4494d2c8daa608fd3a9c0fb1a79b65e2567 100644 (file)
--- a/src/5011000/regcomp.c
+++ b/src/5011000/regcomp.c
@@ -8583,7 +8583,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8639,7 +8639,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8756,7 +8756,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011000/regexec.c b/src/5011000/regexec.c
index a7e62d607a8a9256be47b12d9e09a0f5a8c303ad..0fc5374c2df4cf4c47f07f8ad1dd969294715579 100644 (file)
--- a/src/5011000/regexec.c
+++ b/src/5011000/regexec.c
@@ -2844,7 +2844,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011001/regcomp.c b/src/5011001/regcomp.c
index dbd9339d357d429e822a4751f42ff86e185a6fe9..447d4ae41c7b4ff048f51b5a031c456e91aced84 100644 (file)
--- a/src/5011001/regcomp.c
+++ b/src/5011001/regcomp.c
@@ -8590,7 +8590,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8646,7 +8646,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8763,7 +8763,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011001/regexec.c b/src/5011001/regexec.c
index 321f2681479fee9db2fcfcf8c63e3cafc9476f7d..126d9254238efb206836e02358b232eb7258ed0e 100644 (file)
--- a/src/5011001/regexec.c
+++ b/src/5011001/regexec.c
@@ -2942,7 +2942,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011002/regcomp.c b/src/5011002/regcomp.c
index 5584b73446bf9bb5fa03760e9336896c84558889..b7eb2fbfe6b72bd92b65505a761bec245b73872b 100644 (file)
--- a/src/5011002/regcomp.c
+++ b/src/5011002/regcomp.c
@@ -8589,7 +8589,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8645,7 +8645,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8762,7 +8762,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011002/regexec.c b/src/5011002/regexec.c
index 98fcef19d7d31c35097b2201740473318127bea1..05de97c958789f20af94a513861318240ce7fc6d 100644 (file)
--- a/src/5011002/regexec.c
+++ b/src/5011002/regexec.c
@@ -2937,7 +2937,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011003/regcomp.c b/src/5011003/regcomp.c
index 94db01af9c0e9932be1e7ec1479ee03b9e5b3960..13453715715bf8e887a5691c80b15337852cc349 100644 (file)
--- a/src/5011003/regcomp.c
+++ b/src/5011003/regcomp.c
@@ -8589,7 +8589,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8645,7 +8645,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8762,7 +8762,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011003/regexec.c b/src/5011003/regexec.c
index 9e7bcc73e294b024b30f5021d43ae237e30e4979..1c8825192b8d7b288ccf8ea8c296f9363145aa4b 100644 (file)
--- a/src/5011003/regexec.c
+++ b/src/5011003/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011004/regcomp.c b/src/5011004/regcomp.c
index 94db01af9c0e9932be1e7ec1479ee03b9e5b3960..13453715715bf8e887a5691c80b15337852cc349 100644 (file)
--- a/src/5011004/regcomp.c
+++ b/src/5011004/regcomp.c
@@ -8589,7 +8589,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8645,7 +8645,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8762,7 +8762,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011004/regexec.c b/src/5011004/regexec.c
index 9e7bcc73e294b024b30f5021d43ae237e30e4979..1c8825192b8d7b288ccf8ea8c296f9363145aa4b 100644 (file)
--- a/src/5011004/regexec.c
+++ b/src/5011004/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5011005/regcomp.c b/src/5011005/regcomp.c
index 319f34454312fddf81792d7ff7ea43a39b342b3c..bc51c8eb053429e89275320ec87ccf2e1462cf89 100644 (file)
--- a/src/5011005/regcomp.c
+++ b/src/5011005/regcomp.c
@@ -8571,7 +8571,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8627,7 +8627,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8744,7 +8744,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5011005/regexec.c b/src/5011005/regexec.c
index 9e7bcc73e294b024b30f5021d43ae237e30e4979..1c8825192b8d7b288ccf8ea8c296f9363145aa4b 100644 (file)
--- a/src/5011005/regexec.c
+++ b/src/5011005/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5012000/regcomp.c b/src/5012000/regcomp.c
index 8b43a227a839a674759b145bc910e929626b8225..aa8bf54e7a5754f9c4122123d4bca6b4f83cbb8c 100644 (file)
--- a/src/5012000/regcomp.c
+++ b/src/5012000/regcomp.c
@@ -8571,7 +8571,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8627,7 +8627,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8744,7 +8744,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5012000/regexec.c b/src/5012000/regexec.c
index 9e7bcc73e294b024b30f5021d43ae237e30e4979..1c8825192b8d7b288ccf8ea8c296f9363145aa4b 100644 (file)
--- a/src/5012000/regexec.c
+++ b/src/5012000/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5012001/regcomp.c b/src/5012001/regcomp.c
index 2dce0500ff05676f197e285270ff5c51a5b05563..4039ff242770b0f5b3045d96c90d8450943357d0 100644 (file)
--- a/src/5012001/regcomp.c
+++ b/src/5012001/regcomp.c
@@ -8569,7 +8569,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8625,7 +8625,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8742,7 +8742,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5012001/regexec.c b/src/5012001/regexec.c
index 9e7bcc73e294b024b30f5021d43ae237e30e4979..1c8825192b8d7b288ccf8ea8c296f9363145aa4b 100644 (file)
--- a/src/5012001/regexec.c
+++ b/src/5012001/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5012002/regcomp.c b/src/5012002/regcomp.c
index 2dce0500ff05676f197e285270ff5c51a5b05563..4039ff242770b0f5b3045d96c90d8450943357d0 100644 (file)
--- a/src/5012002/regcomp.c
+++ b/src/5012002/regcomp.c
@@ -8569,7 +8569,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8625,7 +8625,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8742,7 +8742,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5012002/regexec.c b/src/5012002/regexec.c
index 8a81c0b3117865890f3cf7ece917d5f730ed2231..07b32aee576c241348855332e691c82500163598 100644 (file)
--- a/src/5012002/regexec.c
+++ b/src/5012002/regexec.c
@@ -2992,7 +2992,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5012003/regcomp.c b/src/5012003/regcomp.c
index 2dce0500ff05676f197e285270ff5c51a5b05563..4039ff242770b0f5b3045d96c90d8450943357d0 100644 (file)
--- a/src/5012003/regcomp.c
+++ b/src/5012003/regcomp.c
@@ -8569,7 +8569,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8625,7 +8625,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8742,7 +8742,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5012003/regexec.c b/src/5012003/regexec.c
index 8a81c0b3117865890f3cf7ece917d5f730ed2231..07b32aee576c241348855332e691c82500163598 100644 (file)
--- a/src/5012003/regexec.c
+++ b/src/5012003/regexec.c
@@ -2992,7 +2992,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5012004/regcomp.c b/src/5012004/regcomp.c
index 2dce0500ff05676f197e285270ff5c51a5b05563..4039ff242770b0f5b3045d96c90d8450943357d0 100644 (file)
--- a/src/5012004/regcomp.c
+++ b/src/5012004/regcomp.c
@@ -8569,7 +8569,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8625,7 +8625,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8742,7 +8742,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5012004/regexec.c b/src/5012004/regexec.c
index 8a81c0b3117865890f3cf7ece917d5f730ed2231..07b32aee576c241348855332e691c82500163598 100644 (file)
--- a/src/5012004/regexec.c
+++ b/src/5012004/regexec.c
@@ -2992,7 +2992,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013000/regcomp.c b/src/5013000/regcomp.c
index 8b43a227a839a674759b145bc910e929626b8225..aa8bf54e7a5754f9c4122123d4bca6b4f83cbb8c 100644 (file)
--- a/src/5013000/regcomp.c
+++ b/src/5013000/regcomp.c
@@ -8571,7 +8571,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8627,7 +8627,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8744,7 +8744,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013000/regexec.c b/src/5013000/regexec.c
index 24d4e9677455270824d55dc807fe9efc02b51a44..aa779db7bcc8d59121938c6add083fd3f43b06a9 100644 (file)
--- a/src/5013000/regexec.c
+++ b/src/5013000/regexec.c
@@ -2957,7 +2957,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013001/regcomp.c b/src/5013001/regcomp.c
index e7c4882db9374c9bba5bc06426d209907fa64a37..2c7f86d97e312b275d11b3c93766416c7bdc8480 100644 (file)
--- a/src/5013001/regcomp.c
+++ b/src/5013001/regcomp.c
@@ -8615,7 +8615,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8671,7 +8671,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8788,7 +8788,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013001/regexec.c b/src/5013001/regexec.c
index 511e34896a5900e4dd53b0854b7324422bbb5ffe..c7649063b72c86ef3e996467e232e365ae71d05a 100644 (file)
--- a/src/5013001/regexec.c
+++ b/src/5013001/regexec.c
@@ -2959,7 +2959,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013002/regcomp.c b/src/5013002/regcomp.c
index a2bf54f149e007a7147d935f56ad95b70413e8ab..19f1f4927f2b33a43c59970ee7b7eb062986fb39 100644 (file)
--- a/src/5013002/regcomp.c
+++ b/src/5013002/regcomp.c
@@ -8615,7 +8615,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8671,7 +8671,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8788,7 +8788,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013002/regexec.c b/src/5013002/regexec.c
index ef8d475cd01208113375ac7cac0e61d3d1cce82c..0d833b4450e917dd1ddab0cbe485321aa8c06630 100644 (file)
--- a/src/5013002/regexec.c
+++ b/src/5013002/regexec.c
@@ -2959,7 +2959,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013003/regcomp.c b/src/5013003/regcomp.c
index f2ff7b9e5c0569e14080dc2a95cdb74f02b89eeb..d7cdba50a9fb4224b94def3b18177601029dc75f 100644 (file)
--- a/src/5013003/regcomp.c
+++ b/src/5013003/regcomp.c
@@ -8648,7 +8648,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8704,7 +8704,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8821,7 +8821,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013003/regexec.c b/src/5013003/regexec.c
index 39c829f9284ed2ede87e6f802f61fdde11ce6ddb..e80ac125fde8f6c3467f7acfc8d715d3301b48ad 100644 (file)
--- a/src/5013003/regexec.c
+++ b/src/5013003/regexec.c
@@ -2964,7 +2964,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013004/regcomp.c b/src/5013004/regcomp.c
index 223c096820f08bf733eee66ac576039916b6c180..54c7597bd68c6e527177a5638e8af7856ee12059 100644 (file)
--- a/src/5013004/regcomp.c
+++ b/src/5013004/regcomp.c
@@ -8651,7 +8651,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8707,7 +8707,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8824,7 +8824,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013004/regexec.c b/src/5013004/regexec.c
index 4d6a352c29979d3447a8f47be83867a3a868a6d1..0713b5da58821bbf202d3e884ca0b7e265b65ca2 100644 (file)
--- a/src/5013004/regexec.c
+++ b/src/5013004/regexec.c
@@ -2964,7 +2964,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013005/regcomp.c b/src/5013005/regcomp.c
index b5354df863f601de538fc8428ffe0ec996495d28..97fb42d66b03dfa8dfe8c6535c39c80b1908c224 100644 (file)
--- a/src/5013005/regcomp.c
+++ b/src/5013005/regcomp.c
@@ -8687,7 +8687,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8743,7 +8743,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -8860,7 +8860,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013005/regexec.c b/src/5013005/regexec.c
index d5b88933c261e2a33cd53515b18bd47ff1293f20..17c09988ea8e78119a314c31aa74c9218b772333 100644 (file)
--- a/src/5013005/regexec.c
+++ b/src/5013005/regexec.c
@@ -3007,7 +3007,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013006/regcomp.c b/src/5013006/regcomp.c
index bb60c70f7ad1aeb56ea72609150cccee9fba2025..ef5562033fac062227a0b57d4ed047af2ca4e8a0 100644 (file)
--- a/src/5013006/regcomp.c
+++ b/src/5013006/regcomp.c
@@ -8887,7 +8887,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8943,7 +8943,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -9060,7 +9060,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013006/regexec.c b/src/5013006/regexec.c
index 7c891c0501b395a95c96d8317bc5035e7358da94..a710da222a7e5a3d1eb4501a8b96df5a6f593f95 100644 (file)
--- a/src/5013006/regexec.c
+++ b/src/5013006/regexec.c
@@ -3043,7 +3043,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013007/regcomp.c b/src/5013007/regcomp.c
index f5adb4b344a52284d89e099387116fb9f1928020..5162d30c3fdf15022e70c23d2e530bd940f76a53 100644 (file)
--- a/src/5013007/regcomp.c
+++ b/src/5013007/regcomp.c
@@ -8884,7 +8884,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -8940,7 +8940,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -9057,7 +9057,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013007/regexec.c b/src/5013007/regexec.c
index 42c4828ef5833c8c68a6b929025866e61f8afe2d..eb479d29bc24cebad697d35cc6e9192a317e57c2 100644 (file)
--- a/src/5013007/regexec.c
+++ b/src/5013007/regexec.c
@@ -3053,7 +3053,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013008/regcomp.c b/src/5013008/regcomp.c
index 93a77d0d99c6cc622ea7b43d7d9cacaddd1beac9..3f1ba217d1d779a61c7602c677701e9997a541a1 100644 (file)
--- a/src/5013008/regcomp.c
+++ b/src/5013008/regcomp.c
@@ -9135,7 +9135,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -9191,7 +9191,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -9308,7 +9308,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013008/regexec.c b/src/5013008/regexec.c
index 3ce9105501393d358e63d02c5b7c6140125bfeef..c0143ffaa908269eca81b0147842b83c7b510081 100644 (file)
--- a/src/5013008/regexec.c
+++ b/src/5013008/regexec.c
@@ -3072,7 +3072,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013009/regcomp.c b/src/5013009/regcomp.c
index b2c0607d4ba8e3a40e1a981b33bb82d44b1d2ee6..a956d08879fc418bfd02a508b88938b6c8105c82 100644 (file)
--- a/src/5013009/regcomp.c
+++ b/src/5013009/regcomp.c
@@ -9277,7 +9277,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -9333,7 +9333,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -9450,7 +9450,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013009/regexec.c b/src/5013009/regexec.c
index 165966491ce54ab07c274d69fdfcac93a571c772..d5ea99287d0efdc18a777142be2f8315a0ed7e4f 100644 (file)
--- a/src/5013009/regexec.c
+++ b/src/5013009/regexec.c
@@ -3203,7 +3203,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013010/regcomp.c b/src/5013010/regcomp.c
index fccce8e5beddf49b27d6fbd665e6514d6f2edfd7..7c23c133d72297a9dfd0327ac18dbed150ea4402 100644 (file)
--- a/src/5013010/regcomp.c
+++ b/src/5013010/regcomp.c
@@ -10346,7 +10346,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10402,7 +10402,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10519,7 +10519,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013010/regexec.c b/src/5013010/regexec.c
index 087e5b1d504b64aafe4147d3d3f65ff849766358..a5dfefc7be7f54a986931a1a2de215f3ac18f8de 100644 (file)
--- a/src/5013010/regexec.c
+++ b/src/5013010/regexec.c
@@ -3146,7 +3146,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5013011/regcomp.c b/src/5013011/regcomp.c
index b56b32aed271416988e55a962ec8875e12bd9b98..0deb1000885dbfcbbff01184eaf878234dcdb078 100644 (file)
--- a/src/5013011/regcomp.c
+++ b/src/5013011/regcomp.c
@@ -10493,7 +10493,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10549,7 +10549,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10666,7 +10666,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5013011/regexec.c b/src/5013011/regexec.c
index 510dabee9865f9f75cdf3fe3f0a3d6dd169be67a..2ea206933461720175dffcdcee63b31c70b36fea 100644 (file)
--- a/src/5013011/regexec.c
+++ b/src/5013011/regexec.c
@@ -3101,7 +3101,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5014000/regcomp.c b/src/5014000/regcomp.c
index ac152715dbb3bd7a0e67966a690fa83b63a76ec8..9f25d62c0379303d57f701ff5269634acbe5cdde 100644 (file)
--- a/src/5014000/regcomp.c
+++ b/src/5014000/regcomp.c
@@ -10574,7 +10574,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10630,7 +10630,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10747,7 +10747,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5014000/regexec.c b/src/5014000/regexec.c
index 6fd351b8259ce177262d6f4e906e4e170b87ea5f..b293da4a6c74daa9ec19a3a285dc008f82112afb 100644 (file)
--- a/src/5014000/regexec.c
+++ b/src/5014000/regexec.c
@@ -3101,7 +3101,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5014001/regcomp.c b/src/5014001/regcomp.c
index 5322b32fe3dfb4de735fa408b71a698507f51b8a..c8e79b704cc3542066d60f91a8e062646d23a6f2 100644 (file)
--- a/src/5014001/regcomp.c
+++ b/src/5014001/regcomp.c
@@ -10500,7 +10500,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10556,7 +10556,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10673,7 +10673,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5014001/regexec.c b/src/5014001/regexec.c
index f08886049bdea8bf6567c9f1ff0eeea6e44fc595..dcee7734dc9e74c2924a69475f8423d947276a7d 100644 (file)
--- a/src/5014001/regexec.c
+++ b/src/5014001/regexec.c
@@ -3101,7 +3101,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5014002/regcomp.c b/src/5014002/regcomp.c
index 5322b32fe3dfb4de735fa408b71a698507f51b8a..c8e79b704cc3542066d60f91a8e062646d23a6f2 100644 (file)
--- a/src/5014002/regcomp.c
+++ b/src/5014002/regcomp.c
@@ -10500,7 +10500,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10556,7 +10556,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10673,7 +10673,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5014002/regexec.c b/src/5014002/regexec.c
index 88b3432824a381869574deefd8b5dd963df7d497..510b6f5c7c4f62614ca20a22d3bbdeb6b2f32f38 100644 (file)
--- a/src/5014002/regexec.c
+++ b/src/5014002/regexec.c
@@ -3101,7 +3101,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015000/regcomp.c b/src/5015000/regcomp.c
index 47470b3c8244076274b1b246c79f708d69662fd1..6627a41eece50c6058d74b350b24b545ccb50173 100644 (file)
--- a/src/5015000/regcomp.c
+++ b/src/5015000/regcomp.c
@@ -10530,7 +10530,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10586,7 +10586,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -10703,7 +10703,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015000/regexec.c b/src/5015000/regexec.c
index d07bad5454ad2923259a95b14e095dc1d9a8493b..8a05202b29aa958d031f5d39653bb3a07d9d7157 100644 (file)
--- a/src/5015000/regexec.c
+++ b/src/5015000/regexec.c
@@ -3108,7 +3108,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015001/regcomp.c b/src/5015001/regcomp.c
index 07aacf6f44a1f467625d65d454887c2cf357c2b5..e59647f2a6b5e18ce89225a2905af963f3880622 100644 (file)
--- a/src/5015001/regcomp.c
+++ b/src/5015001/regcomp.c
@@ -10846,7 +10846,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10902,7 +10902,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11019,7 +11019,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015001/regexec.c b/src/5015001/regexec.c
index 9a945289ab3850094c1595d852ee69b20aea55b7..c408c329fc2f5eb558d80c7b7ac97efaeb90201b 100644 (file)
--- a/src/5015001/regexec.c
+++ b/src/5015001/regexec.c
@@ -3123,7 +3123,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015002/regcomp.c b/src/5015002/regcomp.c
index 8f577e445ec5c038108fb1b5184a57299e0e2ae9..47512c0156149decd8b3bc6129c21981a92d8ee1 100644 (file)
--- a/src/5015002/regcomp.c
+++ b/src/5015002/regcomp.c
@@ -10851,7 +10851,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10907,7 +10907,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11024,7 +11024,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015002/regexec.c b/src/5015002/regexec.c
index abd02f8f5262148df951599cf11684f9eb1269cf..a6d06f2a72aa48522d944986fd00b627cf4ea274 100644 (file)
--- a/src/5015002/regexec.c
+++ b/src/5015002/regexec.c
@@ -3123,7 +3123,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015003/regcomp.c b/src/5015003/regcomp.c
index 8f577e445ec5c038108fb1b5184a57299e0e2ae9..47512c0156149decd8b3bc6129c21981a92d8ee1 100644 (file)
--- a/src/5015003/regcomp.c
+++ b/src/5015003/regcomp.c
@@ -10851,7 +10851,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10907,7 +10907,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11024,7 +11024,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015003/regexec.c b/src/5015003/regexec.c
index abd02f8f5262148df951599cf11684f9eb1269cf..a6d06f2a72aa48522d944986fd00b627cf4ea274 100644 (file)
--- a/src/5015003/regexec.c
+++ b/src/5015003/regexec.c
@@ -3123,7 +3123,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015004/regcomp.c b/src/5015004/regcomp.c
index a84ecdc99ceb0eda78919b0ab0fc0d4e6cb4a743..8bb7fd5a6b8b9a5cbb7699229fc8f0335fcb8988 100644 (file)
--- a/src/5015004/regcomp.c
+++ b/src/5015004/regcomp.c
@@ -10898,7 +10898,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10954,7 +10954,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11071,7 +11071,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015004/regexec.c b/src/5015004/regexec.c
index a1ceba1afdf24e7bdbffad30409f8104f38a22bd..8b166c025189a3cb198390137b18469d132159e7 100644 (file)
--- a/src/5015004/regexec.c
+++ b/src/5015004/regexec.c
@@ -3161,7 +3161,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015005/regcomp.c b/src/5015005/regcomp.c
index 6078f356e37b91e153998897039d5436d77ee9cf..de973175cf9c7338cb892180fb6592635d2f2450 100644 (file)
--- a/src/5015005/regcomp.c
+++ b/src/5015005/regcomp.c
@@ -10919,7 +10919,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10975,7 +10975,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11092,7 +11092,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015005/regexec.c b/src/5015005/regexec.c
index 56399b030e012687eae6fb83d7d9888961351500..8aa06c49ac883dc0a9f3e81f35aab792dfc9095d 100644 (file)
--- a/src/5015005/regexec.c
+++ b/src/5015005/regexec.c
@@ -3163,7 +3163,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015006/regcomp.c b/src/5015006/regcomp.c
index 6cf72e1407bd7ed1bdd47c36d0a3905105628776..f6874542b92c4d2282b45fc5ddc2599ad5618827 100644 (file)
--- a/src/5015006/regcomp.c
+++ b/src/5015006/regcomp.c
@@ -10920,7 +10920,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -10976,7 +10976,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11093,7 +11093,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015006/regexec.c b/src/5015006/regexec.c
index 56399b030e012687eae6fb83d7d9888961351500..8aa06c49ac883dc0a9f3e81f35aab792dfc9095d 100644 (file)
--- a/src/5015006/regexec.c
+++ b/src/5015006/regexec.c
@@ -3163,7 +3163,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015007/regcomp.c b/src/5015007/regcomp.c
index 3c0137936e636799f9a27a0ab664fb3d973dccaa..d6cc6b717ad1a0091a1765407cf0262adf3b1307 100644 (file)
--- a/src/5015007/regcomp.c
+++ b/src/5015007/regcomp.c
@@ -11436,7 +11436,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -11493,7 +11493,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11610,7 +11610,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015007/regexec.c b/src/5015007/regexec.c
index b1e5dbeb5e4be7c80694e3f789fa0accb412dda6..1c89d8e69a95befdd548cf2be84522805c322dba 100644 (file)
--- a/src/5015007/regexec.c
+++ b/src/5015007/regexec.c
@@ -3173,7 +3173,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015008/regcomp.c b/src/5015008/regcomp.c
index 36f7e97616385f97b8329a9af297f54843dfeb45..8130258e2ecefc56b9d0c39e24c4838b1d896c3f 100644 (file)
--- a/src/5015008/regcomp.c
+++ b/src/5015008/regcomp.c
@@ -11753,7 +11753,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -11810,7 +11810,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -11927,7 +11927,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015008/regexec.c b/src/5015008/regexec.c
index 98d83da2066fdc99d9450a34e4707cb727bc07ef..fc5b63dc5c13f329dd7376bb25dc3e06b7c2f4b1 100644 (file)
--- a/src/5015008/regexec.c
+++ b/src/5015008/regexec.c
@@ -3173,7 +3173,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/5015009/regcomp.c b/src/5015009/regcomp.c
index dda0f1f891cee613a22a7bb71c1e196d79a83008..d517d1fb28c64b27fa8bdb3d06b02c1fa93c8f46 100644 (file)
--- a/src/5015009/regcomp.c
+++ b/src/5015009/regcomp.c
@@ -11845,7 +11845,7 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE(ptr, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 1);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s:%d: (op %s) %s %"UVuf" (len %"UVuf") (max %"UVuf").\n", 
@@ -11902,7 +11902,7 @@ S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
     NODE_ALIGN_FILL(ret);
     ptr = ret;
     FILL_ADVANCE_NODE_ARG(ptr, op, arg);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (ptr) - 2);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (ptr) - 2);
 #ifdef RE_TRACK_PATTERN_OFFSETS
     if (RExC_offsets) {         /* MJD */
        MJD_OFFSET_DEBUG(("%s(%d): (op %s) %s %"UVuf" <- %"UVuf" (max %"UVuf").\n", 
@@ -12019,7 +12019,7 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
 #endif    
     src = NEXTOPER(place);
     FILL_ADVANCE_NODE(place, op);
-    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, (place) - 1);
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, (place) - 1);
     Zero(src, offset, regnode);
 }
 

diff --git a/src/5015009/regexec.c b/src/5015009/regexec.c
index 09ab948a01e5104fe3446cd81b9cd7b1c8f1f62f..682b8b4ce967688c8c1e8047d75a8d635439a9de 100644 (file)
--- a/src/5015009/regexec.c
+++ b/src/5015009/regexec.c
@@ -3176,7 +3176,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regnode *prog)
            next = NULL;
        state_num = OP(scan);
 
-       REH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);
+       REH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);
       reenter_switch:
 
        assert(PL_reglastparen == &rex->lastparen);

diff --git a/src/update.pl b/src/update.pl
index dea38cf8531e15f29167775fd0c2071ea9cb57eb..a36c99d376cc9316a421a14086dc61c46dd2472b 100644 (file)
--- a/src/update.pl
+++ b/src/update.pl
@@ -234,7 +234,7 @@ sub patch_regcomp {
  } elsif ($line =~ /FILL_ADVANCE_NODE(_ARG)?\(\s*([^\s,\)]+)/) {
   my $shift = $1 ? 2 : 1;
   push @{$patched_chunks{$file}}, 'COMP_NODE_HOOK';
-  return $line, "    REH_CALL_REGCOMP_HOOK(pRExC_state->rx, ($2) - $shift);\n"
+  return $line, "    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, ($2) - $shift);\n"
  }
 
  return $line;
@@ -248,7 +248,7 @@ sub patch_regexec {
   return $line, "#include \"re_defs.h\"\n";
  } elsif ($line =~ /^\s*reenter_switch:\s*$/) {
   push @{$patched_chunks{$file}}, 'EXEC_NODE_HOOK';
-  return "\tREH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);\n", $line;
+  return "\tREH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);\n", $line;
  }
 
  return $line;

diff --git a/t/re-engine-Hooks-TestDist/TestDist.xs b/t/re-engine-Hooks-TestDist/TestDist.xs
index 4e1d5119daa6fab681e9e069f3c3b3423cc64ed7..0005b019b09b36074583c0b279d01a8f74934ffc 100644 (file)
--- a/t/re-engine-Hooks-TestDist/TestDist.xs
+++ b/t/re-engine-Hooks-TestDist/TestDist.xs
@@ -22,33 +22,33 @@ STATIC SV *reht_foo_var;
   av_push((AV *) SvRV(V), sv);         \
  } } while (0)
 
-STATIC void reht_foo_comp(pTHX_ regexp *rx, regnode *node) {
+STATIC void reht_foo_comp_node(pTHX_ regexp *rx, regnode *node) {
  REHT_PUSH_NODE_NAME(reht_foo_var, "c:");
 }
 
-STATIC void reht_foo_exec(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
+STATIC void reht_foo_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
  REHT_PUSH_NODE_NAME(reht_foo_var, "e:");
 }
 
 STATIC SV *reht_bar_var;
 
-STATIC void reht_bar_comp(pTHX_ regexp *rx, regnode *node) {
+STATIC void reht_bar_comp_node(pTHX_ regexp *rx, regnode *node) {
  REHT_PUSH_NODE_NAME(reht_bar_var, "c:");
 }
 
-STATIC void reht_bar_exec(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
+STATIC void reht_bar_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
  REHT_PUSH_NODE_NAME(reht_bar_var, "e:");
 }
 
 STATIC SV *reht_custom_var;
 
-STATIC void reht_custom_comp(pTHX_ regexp *rx, regnode *node) {
+STATIC void reht_custom_comp_node(pTHX_ regexp *rx, regnode *node) {
  const char *node_name;
 
  node_name = PL_reg_name[OP(node)];
 }
 
-STATIC void reht_custom_exec(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
+STATIC void reht_custom_exec_node(pTHX_ regexp *rx, regnode *node, regmatch_info *reginfo, regmatch_state *st) {
  STRLEN      node_namelen;
  const char *node_name;
 
@@ -81,24 +81,24 @@ BOOT:
 {
  {
   reh_config foo_cfg;
-  foo_cfg.comp = reht_foo_comp;
-  foo_cfg.exec = reht_foo_exec;
+  foo_cfg.comp_node = reht_foo_comp_node;
+  foo_cfg.exec_node = reht_foo_exec_node;
   reh_register(__PACKAGE__ "::foo", &foo_cfg);
   reht_foo_var = NULL;
  }
 
  {
   reh_config bar_cfg;
-  bar_cfg.comp = reht_bar_comp;
-  bar_cfg.exec = reht_bar_exec;
+  bar_cfg.comp_node = reht_bar_comp_node;
+  bar_cfg.exec_node = reht_bar_exec_node;
   reh_register(__PACKAGE__ "::bar", &bar_cfg);
   reht_bar_var = NULL;
  }
 
  {
   reh_config custom_cfg;
-  custom_cfg.comp = reht_custom_comp;
-  custom_cfg.exec = reht_custom_exec;
+  custom_cfg.comp_node = reht_custom_comp_node;
+  custom_cfg.exec_node = reht_custom_exec_node;
   reh_register(__PACKAGE__ "::custom", &custom_cfg);
   reht_custom_var = NULL;
  }