diff options
| author | Karl Williamson <khw@cpan.org> | 2014-07-31 15:45:13 -0600 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2015-01-21 22:47:28 -0700 |
| commit | 1b643f6deec64c910eecb61a6b77ed1d1856927e (patch) | |
| tree | f59240ff37851a7422724d1e9866e055c5bd634f /regexec.c | |
| parent | d2bf6e9aea402351541dfa51cc288dfa9c3e3c2a (diff) | |
| download | perl-1b643f6deec64c910eecb61a6b77ed1d1856927e.tar.gz | |
regexec.c: Use appropriate macro
This code knows that a \n isn't a word character, but in preparation for
future commits in which word isn't the only possibility, change to use
the appropriate macro.
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -4687,7 +4687,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) if (FLAGS(scan) != REGEX_LOCALE_CHARSET) { ln = isWORDCHAR_uni(ln); if (NEXTCHR_IS_EOS) - n = 0; + n = isWORDCHAR_LC('\n'); else { LOAD_UTF8_CHARCLASS_ALNUM(); n = swash_fetch(PL_utf8_swash_ptrs[_CC_WORDCHAR], (U8*)locinput, @@ -4696,7 +4696,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) } else { ln = isWORDCHAR_LC_uvchr(ln); - n = NEXTCHR_IS_EOS ? 0 : isWORDCHAR_LC_utf8((U8*)locinput); + n = NEXTCHR_IS_EOS ? isWORDCHAR_LC('\n') : isWORDCHAR_LC_utf8((U8*)locinput); } } else { @@ -4718,20 +4718,20 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) switch (FLAGS(scan)) { case REGEX_UNICODE_CHARSET: ln = isWORDCHAR_L1(ln); - n = NEXTCHR_IS_EOS ? 0 : isWORDCHAR_L1(nextchr); + n = NEXTCHR_IS_EOS ? isWORDCHAR_L1('\n') : isWORDCHAR_L1(nextchr); break; case REGEX_LOCALE_CHARSET: ln = isWORDCHAR_LC(ln); - n = NEXTCHR_IS_EOS ? 0 : isWORDCHAR_LC(nextchr); + n = NEXTCHR_IS_EOS ? isWORDCHAR_LC('\n') : isWORDCHAR_LC(nextchr); break; case REGEX_DEPENDS_CHARSET: ln = isWORDCHAR(ln); - n = NEXTCHR_IS_EOS ? 0 : isWORDCHAR(nextchr); + n = NEXTCHR_IS_EOS ? isWORDCHAR('\n') : isWORDCHAR(nextchr); break; case REGEX_ASCII_RESTRICTED_CHARSET: case REGEX_ASCII_MORE_RESTRICTED_CHARSET: ln = isWORDCHAR_A(ln); - n = NEXTCHR_IS_EOS ? 0 : isWORDCHAR_A(nextchr); + n = NEXTCHR_IS_EOS ? isWORDCHAR_A('\n') : isWORDCHAR_A(nextchr); break; default: Perl_croak(aTHX_ "panic: Unexpected FLAGS %u in op %u", FLAGS(scan), OP(scan)); |