From 20f4775e6e5458b56cf04a4bb8f4b4b2c7a98f0c Mon Sep 17 00:00:00 2001
From: Yves Orton <demerphq@gmail.com>
Date: Wed, 3 Aug 2022 15:15:20 +0200
Subject: regex engine - wrap PL_regnode_kind with macro REGNODE_TYPE()

The code confusing uses type and kind as synonyms. Lets end that bad habit
---
 regcomp.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'regcomp.h')

diff --git a/regcomp.h b/regcomp.h
index 616a5177c0..c4b5f551bc 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -306,7 +306,7 @@ struct regnode_ssc {
 #define set_ANYOF_SYNTHETIC(n) STMT_START{ OP(n) = ANYOF;              \
                                            NEXT_OFF(n) = 1;            \
                                } STMT_END
-#define is_ANYOF_SYNTHETIC(n) (PL_regnode_kind[OP(n)] == ANYOF && NEXT_OFF(n) == 1)
+#define is_ANYOF_SYNTHETIC(n) (REGNODE_TYPE(OP(n)) == ANYOF && NEXT_OFF(n) == 1)
 
 /* XXX fix this description.
    Impose a limit of REG_INFTY on various pattern matching operations
@@ -1409,6 +1409,8 @@ typedef enum {
 #  define GET_REGCLASS_AUX_DATA(a,b,c,d,e,f)  get_re_gclass_aux_data(a,b,c,d,e,f)
 #endif
 
+#define REGNODE_TYPE(arg) PL_regnode_kind[(arg)]
+
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
 #include "reginline.h"
 #endif
-- 
cgit v1.2.1