Macroify the block_hooks structure.

Add a flags member, so it can be extended later if necessary. Add a
bhk_eval member, called from doeval to catch requires and string evals.

1 files changed, 23 insertions, 5 deletions

diff --git a/op.h b/op.h
index 7de236ffaf..ac34f1d19b 100644
--- a/op.h
+++ b/op.h
@@ -646,27 +646,45 @@ struct loop {
 #endif
 
 struct block_hooks {
+    U32	    bhk_flags;
     void    (*bhk_start)	(pTHX_ int full);
     void    (*bhk_pre_end)	(pTHX_ OP **seq);
     void    (*bhk_post_end)	(pTHX_ OP **seq);
+    void    (*bhk_eval)		(pTHX_ OP *const saveop);
 };
 
+#define BhkFLAGS(hk)		((hk)->bhk_flags)
+
+#define BHKf_start	    0x01
+#define BHKf_pre_end	    0x02
+#define BHKf_post_end	    0x04
+#define BHKf_eval	    0x08
+
+#define BhkENTRY(hk, which) \
+    ((BhkFLAGS(hk) & BHKf_ ## which) ? ((hk)->bhk_ ## which) : NULL)
+
+#define BhkENTRY_set(hk, which, ptr) \
+    STMT_START { \
+	(hk)->bhk_ ## which = ptr; \
+	(hk)->bhk_flags |= BHKf_ ## which; \
+    } STMT_END
+
 #define CALL_BLOCK_HOOKS(which, arg) \
     STMT_START { \
 	if (PL_blockhooks) { \
 	    I32 i; \
 	    for (i = av_len(PL_blockhooks); i >= 0; i--) { \
 		SV *sv = AvARRAY(PL_blockhooks)[i]; \
-		struct block_hooks *hk;	\
+		BHK *hk; \
 		\
 		assert(SvIOK(sv)); \
 		if (SvUOK(sv)) \
-		    hk = INT2PTR(struct block_hooks *, SvUVX(sv)); \
+		    hk = INT2PTR(BHK *, SvUVX(sv)); \
 		else \
-		    hk = INT2PTR(struct block_hooks *, SvIVX(sv)); \
+		    hk = INT2PTR(BHK *, SvIVX(sv)); \
 		\
-		if (hk->bhk_ ## which) \
-		    CALL_FPTR(hk->bhk_ ## which)(aTHX_ arg); \
+		if (BhkENTRY(hk, which)) \
+		    CALL_FPTR(BhkENTRY(hk, which))(aTHX_ arg); \
 	    } \
 	} \
     } STMT_END