Backport: Add constexpr, const, noexcept and make other small improvements to lexlib.

Backport of changeset 8416:06a43e06a8e0.

1 files changed, 7 insertions, 10 deletions

diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx
index eecaa7b49..3ffc781e7 100644
--- a/lexlib/LexerModule.cxx
+++ b/lexlib/LexerModule.cxx
@@ -30,7 +30,7 @@ LexerModule::LexerModule(int language_,
 	LexerFunction fnFolder_,
 	const char *const wordListDescriptions_[],
 	const LexicalClass *lexClasses_,
-	size_t nClasses_) :
+	size_t nClasses_) noexcept :
 	language(language_),
 	fnLexer(fnLexer_),
 	fnFolder(fnFolder_),
@@ -44,7 +44,7 @@ LexerModule::LexerModule(int language_,
 LexerModule::LexerModule(int language_,
 	LexerFactoryFunction fnFactory_,
 	const char *languageName_,
-	const char * const wordListDescriptions_[]) :
+	const char * const wordListDescriptions_[]) noexcept :
 	language(language_),
 	fnLexer(nullptr),
 	fnFolder(nullptr),
@@ -55,14 +55,11 @@ LexerModule::LexerModule(int language_,
 	languageName(languageName_) {
 }
 
-LexerModule::~LexerModule() {
-}
-
-int LexerModule::GetLanguage() const {
+int LexerModule::GetLanguage() const noexcept {
 	return language;
 }
 
-int LexerModule::GetNumWordLists() const {
+int LexerModule::GetNumWordLists() const noexcept {
 	if (!wordListDescriptions) {
 		return -1;
 	} else {
@@ -76,7 +73,7 @@ int LexerModule::GetNumWordLists() const {
 	}
 }
 
-const char *LexerModule::GetWordListDescription(int index) const {
+const char *LexerModule::GetWordListDescription(int index) const noexcept {
 	assert(index < GetNumWordLists());
 	if (!wordListDescriptions || (index >= GetNumWordLists())) {
 		return "";
@@ -85,11 +82,11 @@ const char *LexerModule::GetWordListDescription(int index) const {
 	}
 }
 
-const LexicalClass *LexerModule::LexClasses() const {
+const LexicalClass *LexerModule::LexClasses() const noexcept {
 	return lexClasses;
 }
 
-size_t LexerModule::NamedStyles() const {
+size_t LexerModule::NamedStyles() const noexcept {
 	return nClasses;
 }