From b3c9933350e5c6b9d06a72034e681cecae52dc4b Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 16 Jul 2020 19:55:15 +1000
Subject: Add constexpr, const, noexcept and make other small improvements to
 lexlib.

---
 lexlib/LexerModule.cxx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'lexlib/LexerModule.cxx')

diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx
index 3d4010756..0f1498bf2 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;
 }
 
-- 
cgit v1.2.3