diff options
Diffstat (limited to 'src/RESearch.cxx')
| -rw-r--r-- | src/RESearch.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/RESearch.cxx b/src/RESearch.cxx index b368890c3..b590e9d71 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -255,7 +255,8 @@ RESearch::RESearch(CharClassify *charClassTable) { charClass = charClassTable; sta = NOP; /* status of lastpat */ bol = 0; - std::fill(bittab, std::end(bittab), static_cast<unsigned char>(0)); + const unsigned char nul=0; + std::fill(bittab, std::end(bittab), nul); std::fill(tagstk, std::end(tagstk), 0); std::fill(nfa, std::end(nfa), '\0'); Clear(); @@ -642,7 +643,7 @@ const char *RESearch::Compile(const char *pattern, Sci::Position length, bool ca if (tagi > 0 && tagstk[tagi] == n) return badpat("Cyclical reference"); if (tagc > n) { - *mp++ = static_cast<char>(REF); + *mp++ = REF; *mp++ = static_cast<char>(n); } else { return badpat("Undetermined reference"); @@ -661,7 +662,7 @@ const char *RESearch::Compile(const char *pattern, Sci::Position length, bool ca if (*sp == BOT) return badpat("Null pattern inside \\(\\)"); if (tagi > 0) { - *mp++ = static_cast<char>(EOT); + *mp++ = EOT; *mp++ = static_cast<char>(tagstk[tagi--]); } else { return badpat("Unmatched \\)"); @@ -697,7 +698,7 @@ const char *RESearch::Compile(const char *pattern, Sci::Position length, bool ca if (*sp == BOT) return badpat("Null pattern inside ()"); if (tagi > 0) { - *mp++ = static_cast<char>(EOT); + *mp++ = EOT; *mp++ = static_cast<char>(tagstk[tagi--]); } else { return badpat("Unmatched )"); |