From d145af01e2d4aa289de75be69857b583f2e01f0d Mon Sep 17 00:00:00 2001 From: Yves Orton Date: Wed, 25 Jan 2023 10:29:48 +0100 Subject: regexp.h - standardize macros, and parenthesize parameters Obviously this isn't required as we build fine. But doing this future proofs us to other changes. --- regexp.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'regexp.h') diff --git a/regexp.h b/regexp.h index 47780e40d2..74dfe088e6 100644 --- a/regexp.h +++ b/regexp.h @@ -557,33 +557,35 @@ and check for NULL. # define RX_COMPFLAGS(rx_sv) RXp_COMPFLAGS(ReANY(rx_sv)) # define RXp_ENGINE(prog) ((prog)->engine) # define RX_ENGINE(rx_sv) (RXp_ENGINE(ReANY(rx_sv))) -# define RXp_SUBBEG(prog) (prog->subbeg) +# define RXp_SUBBEG(prog) ((prog)->subbeg) # define RX_SUBBEG(rx_sv) (RXp_SUBBEG(ReANY(rx_sv))) -# define RXp_SUBOFFSET(prog) (prog->suboffset) +# define RXp_SUBOFFSET(prog) ((prog)->suboffset) # define RX_SUBOFFSET(rx_sv) (RXp_SUBOFFSET(ReANY(rx_sv))) # define RX_SUBCOFFSET(rx_sv) (ReANY(rx_sv)->subcoffset) -# define RXp_OFFSp(prog) (prog->offs) +# define RXp_OFFSp(prog) ((prog)->offs) # define RX_OFFSp(rx_sv) (RXp_OFFSp(ReANY(rx_sv))) -# define RXp_LOGICAL_NPARENS(prog) (prog->logical_nparens) +# define RXp_LOGICAL_NPARENS(prog) ((prog)->logical_nparens) # define RX_LOGICAL_NPARENS(rx_sv) (RXp_LOGICAL_NPARENS(ReANY(rx_sv))) -# define RXp_LOGICAL_TO_PARNO(prog) (prog->logical_to_parno) +# define RXp_LOGICAL_TO_PARNO(prog) ((prog)->logical_to_parno) # define RX_LOGICAL_TO_PARNO(rx_sv) (RXp_LOGICAL_TO_PARNO(ReANY(rx_sv))) -# define RXp_PARNO_TO_LOGICAL(prog) (prog->parno_to_logical) +# define RXp_PARNO_TO_LOGICAL(prog) ((prog)->parno_to_logical) # define RX_PARNO_TO_LOGICAL(rx_sv) (RXp_PARNO_TO_LOGICAL(ReANY(rx_sv))) -# define RXp_PARNO_TO_LOGICAL_NEXT(prog) (prog->parno_to_logical_next) +# define RXp_PARNO_TO_LOGICAL_NEXT(prog) ((prog)->parno_to_logical_next) # define RX_PARNO_TO_LOGICAL_NEXT(rx_sv) (RXp_PARNO_TO_LOGICAL_NEXT(ReANY(rx_sv))) -# define RXp_NPARENS(prog) (prog->nparens) +# define RXp_NPARENS(prog) ((prog)->nparens) # define RX_NPARENS(rx_sv) (RXp_NPARENS(ReANY(rx_sv))) # define RX_SUBLEN(rx_sv) (ReANY(rx_sv)->sublen) -# define RXp_MINLEN(prog) (prog->minlen) +# define RXp_MINLEN(prog) ((prog)->minlen) # define RX_MINLEN(rx_sv) (RXp_MINLEN(ReANY(rx_sv))) -# define RXp_MINLENRET(prog) (prog->minlenret) +# define RXp_MINLENRET(prog) ((prog)->minlenret) # define RX_MINLENRET(rx_sv) (RXp_MINLENRET(ReANY(rx_sv))) -# define RXp_GOFS(prog) (prog->gofs) +# define RXp_GOFS(prog) ((prog)->gofs) # define RX_GOFS(rx_sv) (RXp_GOFS(ReANY(rx_sv))) -# define RX_LASTPAREN(rx_sv) (ReANY(rx_sv)->lastparen) -# define RX_LASTCLOSEPAREN(rx_sv) (ReANY(rx_sv)->lastcloseparen) -# define RXp_SAVED_COPY(prog) (prog->saved_copy) +# define RXp_LASTPAREN(prog) ((prog)->lastparen) +# define RX_LASTPAREN(rx_sv) (RXp_LASTPAREN(ReANY(rx_sv))) +# define RXp_LASTCLOSEPAREN(prog) ((prog)->lastcloseparen) +# define RX_LASTCLOSEPAREN(rx_sv) (RXp_LASTCLOSEPAREN(ReANY(rx_sv))) +# define RXp_SAVED_COPY(prog) ((prog)->saved_copy) # define RX_SAVED_COPY(rx_sv) (RXp_SAVED_COPY(ReANY(rx_sv))) /* last match was zero-length */ # define RXp_ZERO_LEN(prog) \ -- cgit v1.2.1