Extract CharClassify::cc as CharacterClass and change to enum class.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/CharClassify.h b/src/CharClassify.h
index 36cc34558..1fcdb9d5d 100644
--- a/src/CharClassify.h
+++ b/src/CharClassify.h
@@ -10,20 +10,21 @@
 
 namespace Scintilla {
 
+enum class CharacterClass : unsigned char { space, newLine, word, punctuation };
+
 class CharClassify {
 public:
 	CharClassify();
 
-	enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation };
 	void SetDefaultCharClasses(bool includeWordClass);
-	void SetCharClasses(const unsigned char *chars, cc newCharClass);
-	int GetCharsOfClass(cc characterClass, unsigned char *buffer) const noexcept;
-	cc GetClass(unsigned char ch) const noexcept { return static_cast<cc>(charClass[ch]);}
-	bool IsWord(unsigned char ch) const noexcept { return static_cast<cc>(charClass[ch]) == ccWord;}
+	void SetCharClasses(const unsigned char *chars, CharacterClass newCharClass);
+	int GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const noexcept;
+	CharacterClass GetClass(unsigned char ch) const noexcept { return charClass[ch];}
+	bool IsWord(unsigned char ch) const noexcept { return charClass[ch] == CharacterClass::word;}
 
 private:
-	enum { maxChar=256 };
-	unsigned char charClass[maxChar];    // not type cc to save space
+	static constexpr int maxChar=256;
+	CharacterClass charClass[maxChar];
 };
 
 }