aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Document.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/Document.cxx')
-rw-r--r--src/Document.cxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/Document.cxx b/src/Document.cxx
index 4548064b5..0a4c8ca0b 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -1731,7 +1731,7 @@ Sci::Position Document::ParaDown(Sci::Position pos) const {
return LineEnd(line-1);
}
-CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
+CharacterClass Document::WordCharacterClass(unsigned int ch) const {
if (dbcsCodePage && (!UTF8IsAscii(ch))) {
if (SC_CP_UTF8 == dbcsCodePage) {
// Use hard coded Unicode class
@@ -1741,7 +1741,7 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
// Separator, Line/Paragraph
case ccZl:
case ccZp:
- return CharClassify::ccNewLine;
+ return CharacterClass::newLine;
// Separator, Space
case ccZs:
@@ -1751,7 +1751,7 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
case ccCs:
case ccCo:
case ccCn:
- return CharClassify::ccSpace;
+ return CharacterClass::space;
// Letter
case ccLu:
@@ -1767,7 +1767,7 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
case ccMn:
case ccMc:
case ccMe:
- return CharClassify::ccWord;
+ return CharacterClass::word;
// Punctuation
case ccPc:
@@ -1782,12 +1782,12 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
case ccSc:
case ccSk:
case ccSo:
- return CharClassify::ccPunctuation;
+ return CharacterClass::punctuation;
}
} else {
// Asian DBCS
- return CharClassify::ccWord;
+ return CharacterClass::word;
}
}
return charClass.GetClass(static_cast<unsigned char>(ch));
@@ -1798,7 +1798,7 @@ CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
* Finds the start of word at pos when delta < 0 or the end of the word when delta >= 0.
*/
Sci::Position Document::ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters) const {
- CharClassify::cc ccStart = CharClassify::ccWord;
+ CharacterClass ccStart = CharacterClass::word;
if (delta < 0) {
if (!onlyWordCharacters) {
const CharacterExtracted ce = CharacterBefore(pos);
@@ -1836,13 +1836,13 @@ Sci::Position Document::NextWordStart(Sci::Position pos, int delta) const {
if (delta < 0) {
while (pos > 0) {
const CharacterExtracted ce = CharacterBefore(pos);
- if (WordCharacterClass(ce.character) != CharClassify::ccSpace)
+ if (WordCharacterClass(ce.character) != CharacterClass::space)
break;
pos -= ce.widthBytes;
}
if (pos > 0) {
CharacterExtracted ce = CharacterBefore(pos);
- const CharClassify::cc ccStart = WordCharacterClass(ce.character);
+ const CharacterClass ccStart = WordCharacterClass(ce.character);
while (pos > 0) {
ce = CharacterBefore(pos);
if (WordCharacterClass(ce.character) != ccStart)
@@ -1852,7 +1852,7 @@ Sci::Position Document::NextWordStart(Sci::Position pos, int delta) const {
}
} else {
CharacterExtracted ce = CharacterAfter(pos);
- const CharClassify::cc ccStart = WordCharacterClass(ce.character);
+ const CharacterClass ccStart = WordCharacterClass(ce.character);
while (pos < LengthNoExcept()) {
ce = CharacterAfter(pos);
if (WordCharacterClass(ce.character) != ccStart)
@@ -1861,7 +1861,7 @@ Sci::Position Document::NextWordStart(Sci::Position pos, int delta) const {
}
while (pos < LengthNoExcept()) {
ce = CharacterAfter(pos);
- if (WordCharacterClass(ce.character) != CharClassify::ccSpace)
+ if (WordCharacterClass(ce.character) != CharacterClass::space)
break;
pos += ce.widthBytes;
}
@@ -1880,8 +1880,8 @@ Sci::Position Document::NextWordEnd(Sci::Position pos, int delta) const {
if (delta < 0) {
if (pos > 0) {
CharacterExtracted ce = CharacterBefore(pos);
- const CharClassify::cc ccStart = WordCharacterClass(ce.character);
- if (ccStart != CharClassify::ccSpace) {
+ const CharacterClass ccStart = WordCharacterClass(ce.character);
+ if (ccStart != CharacterClass::space) {
while (pos > 0) {
ce = CharacterBefore(pos);
if (WordCharacterClass(ce.character) != ccStart)
@@ -1891,7 +1891,7 @@ Sci::Position Document::NextWordEnd(Sci::Position pos, int delta) const {
}
while (pos > 0) {
ce = CharacterBefore(pos);
- if (WordCharacterClass(ce.character) != CharClassify::ccSpace)
+ if (WordCharacterClass(ce.character) != CharacterClass::space)
break;
pos -= ce.widthBytes;
}
@@ -1899,13 +1899,13 @@ Sci::Position Document::NextWordEnd(Sci::Position pos, int delta) const {
} else {
while (pos < LengthNoExcept()) {
const CharacterExtracted ce = CharacterAfter(pos);
- if (WordCharacterClass(ce.character) != CharClassify::ccSpace)
+ if (WordCharacterClass(ce.character) != CharacterClass::space)
break;
pos += ce.widthBytes;
}
if (pos < LengthNoExcept()) {
CharacterExtracted ce = CharacterAfter(pos);
- const CharClassify::cc ccStart = WordCharacterClass(ce.character);
+ const CharacterClass ccStart = WordCharacterClass(ce.character);
while (pos < LengthNoExcept()) {
ce = CharacterAfter(pos);
if (WordCharacterClass(ce.character) != ccStart)
@@ -1926,10 +1926,10 @@ bool Document::IsWordStartAt(Sci::Position pos) const {
return false;
if (pos > 0) {
const CharacterExtracted cePos = CharacterAfter(pos);
- const CharClassify::cc ccPos = WordCharacterClass(cePos.character);
+ const CharacterClass ccPos = WordCharacterClass(cePos.character);
const CharacterExtracted cePrev = CharacterBefore(pos);
- const CharClassify::cc ccPrev = WordCharacterClass(cePrev.character);
- return (ccPos == CharClassify::ccWord || ccPos == CharClassify::ccPunctuation) &&
+ const CharacterClass ccPrev = WordCharacterClass(cePrev.character);
+ return (ccPos == CharacterClass::word || ccPos == CharacterClass::punctuation) &&
(ccPos != ccPrev);
}
return true;
@@ -1944,10 +1944,10 @@ bool Document::IsWordEndAt(Sci::Position pos) const {
return false;
if (pos < LengthNoExcept()) {
const CharacterExtracted cePos = CharacterAfter(pos);
- const CharClassify::cc ccPos = WordCharacterClass(cePos.character);
+ const CharacterClass ccPos = WordCharacterClass(cePos.character);
const CharacterExtracted cePrev = CharacterBefore(pos);
- const CharClassify::cc ccPrev = WordCharacterClass(cePrev.character);
- return (ccPrev == CharClassify::ccWord || ccPrev == CharClassify::ccPunctuation) &&
+ const CharacterClass ccPrev = WordCharacterClass(cePrev.character);
+ return (ccPrev == CharacterClass::word || ccPrev == CharacterClass::punctuation) &&
(ccPrev != ccPos);
}
return true;
@@ -2186,11 +2186,11 @@ void Document::SetDefaultCharClasses(bool includeWordClass) {
charClass.SetDefaultCharClasses(includeWordClass);
}
-void Document::SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass) {
+void Document::SetCharClasses(const unsigned char *chars, CharacterClass newCharClass) {
charClass.SetCharClasses(chars, newCharClass);
}
-int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) const {
+int Document::GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const {
return charClass.GetCharsOfClass(characterClass, buffer);
}
@@ -2528,7 +2528,7 @@ static bool IsASCIIPunctuationCharacter(unsigned int ch) noexcept {
}
bool Document::IsWordPartSeparator(unsigned int ch) const {
- return (WordCharacterClass(ch) == CharClassify::ccWord) && IsASCIIPunctuationCharacter(ch);
+ return (WordCharacterClass(ch) == CharacterClass::word) && IsASCIIPunctuationCharacter(ch);
}
Sci::Position Document::WordPartLeft(Sci::Position pos) const {
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 19:48:34 +0000