X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=src%2F5013001%2Fregcomp.c;h=71efa0aa33f3a8a6bcc5c4c3d6acf1ee058ef5ad;hb=f609ee10b4b981c6c131936a39d13108d608a4fc;hp=d1485296774c3c075d7bdcb722565921e8b53dc2;hpb=7b88eb9cbb0c1342a6480820450644708aed019c;p=perl%2Fmodules%2Fre-engine-Hooks.git

diff --git a/src/5013001/regcomp.c b/src/5013001/regcomp.c
index d148529..71efa0a 100644
--- a/src/5013001/regcomp.c
+++ b/src/5013001/regcomp.c
@@ -2159,6 +2159,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, regnode *firs
             Set_Node_Offset_Length(convert,mjd_offset,mjd_nodelen);
         });
     } /* end node insert */
+    REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, convert);
 
     /*  Finish populating the prev field of the wordinfo array.  Walk back
      *  from each accept state until we find another accept state, and if
@@ -4223,7 +4224,7 @@ Perl_reginitcolors(pTHX)
 
 
 #ifndef PERL_IN_XSUB_RE
-#define RE_ENGINE_PTR &PL_core_reg_engine
+#define RE_ENGINE_PTR &reh_regexp_engine
 #else
 extern const struct regexp_engine my_reg_engine;
 #define RE_ENGINE_PTR &my_reg_engine
@@ -4460,6 +4461,7 @@ redo_first_pass:
     RExC_rx_sv = rx;
     RExC_rx = r;
     RExC_rxi = ri;
+    REH_CALL_COMP_BEGIN_HOOK(pRExC_state->rx);
 
     /* Second pass: emit code. */
     RExC_flags = pm_flags;	/* don't let top level (?i) bleed */
@@ -8614,7 +8616,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", 
@@ -8670,7 +8672,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", 
@@ -8787,7 +8789,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);
 }