diff options
| author | Karl Williamson <khw@cpan.org> | 2014-06-21 21:53:03 -0600 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2014-06-26 18:09:18 -0600 |
| commit | c84a03c56c722f1018ca806b00f56d3e6b1b0866 (patch) | |
| tree | 5029dff9ff777c5a859f6c2c6f914a37c117086f /regexec.c | |
| parent | 15a68bb3e99f8b88deb12269cb703a1ab7ea9fd8 (diff) | |
| download | perl-c84a03c56c722f1018ca806b00f56d3e6b1b0866.tar.gz | |
regexec.c: Change MiXeD cAsE formal macro parameters
I find these a pain to type and read, and there is no reason for them.
As formal parameters there is no possibility of conflict with the code
outside them. And I'm about to do some editing of these, so this change
will make that easier.
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -1502,10 +1502,10 @@ STMT_START { } \ } STMT_END -#define REXEC_FBC_EXACTISH_SCAN(CoNd) \ +#define REXEC_FBC_EXACTISH_SCAN(COND) \ STMT_START { \ while (s <= e) { \ - if ( (CoNd) \ + if ( (COND) \ && (ln == 1 || folder(s, pat_string, ln)) \ && (reginfo->intuit || regtry(reginfo, &s)) )\ goto got_it; \ @@ -1513,25 +1513,25 @@ STMT_START { \ } \ } STMT_END -#define REXEC_FBC_UTF8_SCAN(CoDe) \ +#define REXEC_FBC_UTF8_SCAN(CODE) \ STMT_START { \ while (s < strend) { \ - CoDe \ + CODE \ s += UTF8SKIP(s); \ } \ } STMT_END -#define REXEC_FBC_SCAN(CoDe) \ +#define REXEC_FBC_SCAN(CODE) \ STMT_START { \ while (s < strend) { \ - CoDe \ + CODE \ s++; \ } \ } STMT_END -#define REXEC_FBC_UTF8_CLASS_SCAN(CoNd) \ +#define REXEC_FBC_UTF8_CLASS_SCAN(COND) \ REXEC_FBC_UTF8_SCAN( \ - if (CoNd) { \ + if (COND) { \ if (tmp && (reginfo->intuit || regtry(reginfo, &s))) \ goto got_it; \ else \ @@ -1541,9 +1541,9 @@ REXEC_FBC_UTF8_SCAN( \ tmp = 1; \ ) -#define REXEC_FBC_CLASS_SCAN(CoNd) \ +#define REXEC_FBC_CLASS_SCAN(COND) \ REXEC_FBC_SCAN( \ - if (CoNd) { \ + if (COND) { \ if (tmp && (reginfo->intuit || regtry(reginfo, &s))) \ goto got_it; \ else \ @@ -1557,12 +1557,12 @@ REXEC_FBC_SCAN( \ if ((reginfo->intuit || regtry(reginfo, &s))) \ goto got_it -#define REXEC_FBC_CSCAN(CoNdUtF8,CoNd) \ +#define REXEC_FBC_CSCAN(CONDUTF8,COND) \ if (utf8_target) { \ - REXEC_FBC_UTF8_CLASS_SCAN(CoNdUtF8); \ + REXEC_FBC_UTF8_CLASS_SCAN(CONDUTF8); \ } \ else { \ - REXEC_FBC_CLASS_SCAN(CoNd); \ + REXEC_FBC_CLASS_SCAN(COND); \ } #define DUMP_EXEC_POS(li,s,doutf8) \ @@ -1583,7 +1583,7 @@ if ((reginfo->intuit || regtry(reginfo, &s))) \ } \ ); \ -#define UTF8_LOAD(TeSt1_UtF8, TeSt2_UtF8, IF_SUCCESS, IF_FAIL) \ +#define UTF8_LOAD(TEST1_UTF8, TEST2_UTF8, IF_SUCCESS, IF_FAIL) \ if (s == reginfo->strbeg) { \ tmp = '\n'; \ } \ @@ -1592,10 +1592,10 @@ if ((reginfo->intuit || regtry(reginfo, &s))) \ tmp = utf8n_to_uvchr(r, (U8*) reginfo->strend - r, \ 0, UTF8_ALLOW_DEFAULT); \ } \ - tmp = TeSt1_UtF8; \ + tmp = TEST1_UTF8; \ LOAD_UTF8_CHARCLASS_ALNUM(); \ REXEC_FBC_UTF8_SCAN( \ - if (tmp == ! (TeSt2_UtF8)) { \ + if (tmp == ! (TEST2_UTF8)) { \ tmp = !tmp; \ IF_SUCCESS; \ } \ |