diff options
Diffstat (limited to 'src/CharClassify.cxx')
| -rw-r--r-- | src/CharClassify.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx index b5e2870f3..f82fe75a6 100644 --- a/src/CharClassify.cxx +++ b/src/CharClassify.cxx @@ -21,29 +21,29 @@ CharClassify::CharClassify() : charClass{} { void CharClassify::SetDefaultCharClasses(bool includeWordClass) { // Initialize all char classes to default values - for (int ch = 0; ch < 256; ch++) { + for (int ch = 0; ch < maxChar; ch++) { if (ch == '\r' || ch == '\n') - charClass[ch] = ccNewLine; + charClass[ch] = CharacterClass::newLine; else if (ch < 0x20 || ch == ' ') - charClass[ch] = ccSpace; + charClass[ch] = CharacterClass::space; else if (includeWordClass && (ch >= 0x80 || IsAlphaNumeric(ch) || ch == '_')) - charClass[ch] = ccWord; + charClass[ch] = CharacterClass::word; else - charClass[ch] = ccPunctuation; + charClass[ch] = CharacterClass::punctuation; } } -void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) { +void CharClassify::SetCharClasses(const unsigned char *chars, CharacterClass newCharClass) { // Apply the newCharClass to the specified chars if (chars) { while (*chars) { - charClass[*chars] = static_cast<unsigned char>(newCharClass); + charClass[*chars] = newCharClass; chars++; } } } -int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) const noexcept { +int CharClassify::GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const noexcept { // Get characters belonging to the given char class; return the number // of characters (if the buffer is NULL, don't write to it). int count = 0; |