diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-08-21 16:20:58 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-08-21 16:20:58 +0000 |
| commit | a4eb266fccae11165d7886ace97009e8b6569d84 (patch) | |
| tree | 6dd7f5232745c117a5b9144844ac2ef5dd5e70ee /regcomp.c | |
| parent | f27e1f0aacc94b7a6842aa4ce6eaf1892ef14b83 (diff) | |
| download | perl-a4eb266fccae11165d7886ace97009e8b6569d84.tar.gz | |
Rename the macro argument because some preprocessors
can't tell the difference and expand arguments also inside
double quoted strings.
p4raw-id: //depot/perl@6747
Diffstat (limited to 'regcomp.c')
| -rw-r--r-- | regcomp.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -220,9 +220,9 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, * arg. Show regex, up to a maximum length. If it's too long, chop and add * "...". */ -#define FAIL(m) \ +#define FAIL(msg) \ STMT_START { \ - char *elipises = ""; \ + char *ellipses = ""; \ unsigned len = strlen(PL_regprecomp); \ \ if (!SIZE_ONLY) \ @@ -231,10 +231,10 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, if (len > RegexLengthToShowInErrorMessages) { \ /* chop 10 shorter than the max, to ensure meaning of "..." */ \ len = RegexLengthToShowInErrorMessages - 10; \ - elipises = "..."; \ + ellipses = "..."; \ } \ Perl_croak(aTHX_ "%s in regex m/%.*s%s/", \ - m, len, PL_regprecomp, elipises); \ + msg, len, PL_regprecomp, ellipses); \ } STMT_END /* @@ -242,9 +242,9 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, * args. Show regex, up to a maximum length. If it's too long, chop and add * "...". */ -#define FAIL2(pat,m) \ +#define FAIL2(pat,msg) \ STMT_START { \ - char *elipises = ""; \ + char *ellipses = ""; \ unsigned len = strlen(PL_regprecomp); \ \ if (!SIZE_ONLY) \ @@ -253,10 +253,10 @@ static scan_data_t zero_scan_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, if (len > RegexLengthToShowInErrorMessages) { \ /* chop 10 shorter than the max, to ensure meaning of "..." */ \ len = RegexLengthToShowInErrorMessages - 10; \ - elipises = "..."; \ + ellipses = "..."; \ } \ S_re_croak2(aTHX_ pat, " in regex m/%.*s%s/", \ - m, len, PL_regprecomp, elipises); \ + msg, len, PL_regprecomp, ellipses); \ } STMT_END |