From e7fd4aa18abbfe0099d4947060c99ca85f42f764 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Thu, 18 Dec 2014 14:03:09 -0700 Subject: [PATCH] regcomp.c, regexec.c: Vertically align ternary operators For clarity --- regcomp.c | 14 +++++++++----- regexec.c | 18 +++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/regcomp.c b/regcomp.c index 11b424e..25d382c 100644 --- a/regcomp.c +++ b/regcomp.c @@ -4151,11 +4151,15 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, */ -#define TRIE_TYPE(X) ( ( NOTHING == (X) ) ? NOTHING : \ - ( EXACT == (X) ) ? EXACT : \ - ( EXACTFU == (X) || EXACTFU_SS == (X) ) ? EXACTFU : \ - ( EXACTFA == (X) ) ? EXACTFA : \ - 0 ) +#define TRIE_TYPE(X) ( ( NOTHING == (X) ) \ + ? NOTHING \ + : ( EXACT == (X) ) \ + ? EXACT \ + : ( EXACTFU == (X) || EXACTFU_SS == (X) ) \ + ? EXACTFU \ + : ( EXACTFA == (X) ) \ + ? EXACTFA \ + : 0 ) /* dont use tail as the end marker for this traverse */ for ( cur = startbranch ; cur != scan ; cur = regnext( cur ) ) { diff --git a/regexec.c b/regexec.c index ebb80c3..10343a0 100644 --- a/regexec.c +++ b/regexec.c @@ -1433,13 +1433,17 @@ Perl_re_intuit_start(pTHX_ #define DECL_TRIE_TYPE(scan) \ - const enum { trie_plain, trie_utf8, trie_utf8_fold, trie_latin_utf8_fold, \ - trie_utf8_exactfa_fold, trie_latin_utf8_exactfa_fold } \ - trie_type = ((scan->flags == EXACT) \ - ? (utf8_target ? trie_utf8 : trie_plain) \ - : (scan->flags == EXACTFA) \ - ? (utf8_target ? trie_utf8_exactfa_fold : trie_latin_utf8_exactfa_fold) \ - : (utf8_target ? trie_utf8_fold : trie_latin_utf8_fold)) + const enum { trie_plain, trie_utf8, trie_utf8_fold, trie_latin_utf8_fold, \ + trie_utf8_exactfa_fold, trie_latin_utf8_exactfa_fold } \ + trie_type = ((scan->flags == EXACT) \ + ? (utf8_target ? trie_utf8 : trie_plain) \ + : (scan->flags == EXACTFA) \ + ? (utf8_target \ + ? trie_utf8_exactfa_fold \ + : trie_latin_utf8_exactfa_fold) \ + : (utf8_target \ + ? trie_utf8_fold \ + : trie_latin_utf8_fold)) #define REXEC_TRIE_READ_CHAR(trie_type, trie, widecharmap, uc, uscan, len, uvc, charid, foldlen, foldbuf, uniflags) \ STMT_START { \ -- 1.8.3.1