Use constant declarations and avoid else to silence warnings.

1 files changed, 13 insertions, 11 deletions

diff --git a/src/CharacterType.h b/src/CharacterType.h
index 437fb8c5c..8564e138d 100644
--- a/src/CharacterType.h
+++ b/src/CharacterType.h
@@ -16,8 +16,11 @@ namespace Scintilla::Internal {
  * Check if a character is a space.
  * This is ASCII specific but is safe with chars >= 0x80.
  */
+constexpr int charTab = 0x09;
+constexpr int charCarriageReturn = 0x0D;
+
 constexpr bool IsASpace(int ch) noexcept {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+    return (ch == ' ') || ((ch >= charTab) && (ch <= charCarriageReturn));
 }
 
 constexpr bool IsSpaceOrTab(int ch) noexcept {
@@ -44,17 +47,18 @@ constexpr bool IsADigit(int ch) noexcept {
 }
 
 constexpr bool IsADigit(int ch, int base) noexcept {
-	if (base <= 10) {
+	constexpr int digits = 10;
+	if (base <= digits) {
 		return (ch >= '0') && (ch < '0' + base);
-	} else {
-		return ((ch >= '0') && (ch <= '9')) ||
-		       ((ch >= 'A') && (ch < 'A' + base - 10)) ||
-		       ((ch >= 'a') && (ch < 'a' + base - 10));
 	}
+	return ((ch >= '0') && (ch <= '9')) ||
+		    ((ch >= 'A') && (ch < 'A' + base - digits)) ||
+		    ((ch >= 'a') && (ch < 'a' + base - digits));
 }
 
 constexpr bool IsASCII(int ch) noexcept {
-	return (ch >= 0) && (ch < 0x80);
+	constexpr int lastASCII = 0x7F;
+	return (ch >= 0) && (ch <= lastASCII);
 }
 
 constexpr bool IsLowerCase(int ch) noexcept {
@@ -122,16 +126,14 @@ template <typename T>
 constexpr T MakeUpperCase(T ch) noexcept {
 	if (ch < 'a' || ch > 'z')
 		return ch;
-	else
-		return ch - 'a' + 'A';
+	return ch - 'a' + 'A';
 }
 
 template <typename T>
 constexpr T MakeLowerCase(T ch) noexcept {
 	if (ch < 'A' || ch > 'Z')
 		return ch;
-	else
-		return ch - 'A' + 'a';
+	return ch - 'A' + 'a';
 }
 
 int CompareCaseInsensitive(const char *a, const char *b) noexcept;