* 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) \
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
/*
* 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) \
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
ret = reg_node(BOL);
break;
case '$':
- if (PL_regcomp_parse[1])
- PL_seen_zerolen++;
nextchar();
+ if (*PL_regcomp_parse)
+ PL_seen_zerolen++;
if (PL_regflags & PMf_MULTILINE)
ret = reg_node(MEOL);
else if (PL_regflags & PMf_SINGLELINE)