From: Vincent Pit <vince@profvince.com>
Date: Sat, 31 Mar 2012 13:07:42 +0000 (+0200)
Subject: Rename *comp* (resp. *exec*) to *comp_node* (resp. *exec_node*)
X-Git-Tag: v0.02~5
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=3873fbc39d250734131e096da47add0cf601d194;p=perl%2Fmodules%2Fre-engine-Hooks.git

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

For future consistency.
---

diff --git a/Hooks.xs b/Hooks.xs
index b312223..10a68da 100644
--- 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 43683e5..97da688 100644
--- 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 f9510b8..b9e1ac2 100644
--- 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 3613490..671c9a8 100644
--- 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 ccbe60e..924c7f8 100644
--- 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 66547f5..618346d 100644
--- 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 497219f..c5edf44 100644
--- 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 a7e62d6..0fc5374 100644
--- 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 dbd9339..447d4ae 100644
--- 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 321f268..126d925 100644
--- 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 5584b73..b7eb2fb 100644
--- 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 98fcef1..05de97c 100644
--- 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 94db01a..1345371 100644
--- 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 9e7bcc7..1c88251 100644
--- 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 94db01a..1345371 100644
--- 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 9e7bcc7..1c88251 100644
--- 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 319f344..bc51c8e 100644
--- 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 9e7bcc7..1c88251 100644
--- 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 8b43a22..aa8bf54 100644
--- 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 9e7bcc7..1c88251 100644
--- 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 2dce050..4039ff2 100644
--- 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 9e7bcc7..1c88251 100644
--- 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 2dce050..4039ff2 100644
--- 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 8a81c0b..07b32ae 100644
--- 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 2dce050..4039ff2 100644
--- 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 8a81c0b..07b32ae 100644
--- 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 2dce050..4039ff2 100644
--- 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 8a81c0b..07b32ae 100644
--- 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 8b43a22..aa8bf54 100644
--- 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 24d4e96..aa779db 100644
--- 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 e7c4882..2c7f86d 100644
--- 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 511e348..c764906 100644
--- 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 a2bf54f..19f1f49 100644
--- 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 ef8d475..0d833b4 100644
--- 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 f2ff7b9..d7cdba5 100644
--- 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 39c829f..e80ac12 100644
--- 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 223c096..54c7597 100644
--- 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 4d6a352..0713b5d 100644
--- 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 b5354df..97fb42d 100644
--- 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 d5b8893..17c0998 100644
--- 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 bb60c70..ef55620 100644
--- 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 7c891c0..a710da2 100644
--- 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 f5adb4b..5162d30 100644
--- 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 42c4828..eb479d2 100644
--- 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 93a77d0..3f1ba21 100644
--- 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 3ce9105..c0143ff 100644
--- 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 b2c0607..a956d08 100644
--- 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 1659664..d5ea992 100644
--- 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 fccce8e..7c23c13 100644
--- 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 087e5b1..a5dfefc 100644
--- 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 b56b32a..0deb100 100644
--- 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 510dabe..2ea2069 100644
--- 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 ac15271..9f25d62 100644
--- 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 6fd351b..b293da4 100644
--- 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 5322b32..c8e79b7 100644
--- 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 f088860..dcee773 100644
--- 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 5322b32..c8e79b7 100644
--- 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 88b3432..510b6f5 100644
--- 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 47470b3..6627a41 100644
--- 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 d07bad5..8a05202 100644
--- 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 07aacf6..e59647f 100644
--- 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 9a94528..c408c32 100644
--- 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 8f577e4..47512c0 100644
--- 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 abd02f8..a6d06f2 100644
--- 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 8f577e4..47512c0 100644
--- 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 abd02f8..a6d06f2 100644
--- 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 a84ecdc..8bb7fd5 100644
--- 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 a1ceba1..8b166c0 100644
--- 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 6078f35..de97317 100644
--- 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 56399b0..8aa06c4 100644
--- 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 6cf72e1..f687454 100644
--- 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 56399b0..8aa06c4 100644
--- 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 3c01379..d6cc6b7 100644
--- 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 b1e5dbe..1c89d8e 100644
--- 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 36f7e97..8130258 100644
--- 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 98d83da..fc5b63d 100644
--- 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 dda0f1f..d517d1f 100644
--- 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 09ab948..682b8b4 100644
--- 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 dea38cf..a36c99d 100644
--- 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 4e1d511..0005b01 100644
--- 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;
  }