Added tests for char tools

2 files changed, 25 insertions, 27 deletions

diff --git a/Src/CharTools.cpp b/Src/CharTools.cpp
index 79cc679..5a7028c 100644
--- a/Src/CharTools.cpp
+++ b/Src/CharTools.cpp
@@ -2,11 +2,13 @@
 #include <algorithm>
 
 bool CharTools::IsVowel(const char c, const std::string &vowels) {
+    const char lc = MakeLower(c);
+
     return std::any_of(
             vowels.cbegin(),
             vowels.cend(),
-            [c](const char vowel) {
-                return c == vowel;
+            [lc](const char vowel) {
+                return lc == vowel;
             }
     );
 }
@@ -18,19 +20,28 @@ bool CharTools::IsLetter(const char c) {
     return (lowercase_c >= 'a') && (lowercase_c <= 'z');
 }
 
-bool CharTools::IsGeneric(const char c) {
-    return (c == UPPERCASE) || (c == LOWERCASE);
+bool CharTools::IsDigit(const char c) {
+    return (c >= '0') && (c <= '9');
 }
 
 bool CharTools::IsUpper(const char c) {
-    if ((!IsLetter(c)) && (!IsGeneric(c)))
+    if (!IsLetter(c))
         return false;
     else
         return !(c & (1<<5));
 }
 
+bool CharTools::IsLower(const char c) {
+    // Can't just return !IsUpper(c), because it should still return false for digits and symbols...
+
+    if (!IsLetter(c))
+        return false;
+    else
+        return (c & (1<<5));
+}
+
 char CharTools::MakeUpper(char c) {
-    if ((!IsLetter(c)) && (!IsGeneric(c)))
+    if (!IsLetter(c))
         return c;
     else if (IsUpper(c))
         return c;
@@ -39,7 +50,7 @@ char CharTools::MakeUpper(char c) {
 }
 
 char CharTools::MakeLower(char c) {
-    if ((!IsLetter(c)) && (!IsGeneric(c)))
+    if (!IsLetter(c))
         return c;
     else if (!IsUpper(c))
         return c;
@@ -47,15 +58,8 @@ char CharTools::MakeLower(char c) {
         return c | (1<<5);
 }
 
-char CharTools::GetSign(char c) {
-    if (IsUpper(c))
-        return UPPERCASE;
-    else
-        return LOWERCASE;
-}
-
 char CharTools::CopySign(char sign, char c) {
-    if ((!IsLetter(c)) && (!IsGeneric(c)))
+    if ((!IsLetter(c)) || (!IsLetter(sign)))
         return c;
     if (IsUpper(sign))
         return MakeUpper(c);
diff --git a/Src/CharTools.h b/Src/CharTools.h
index 3d7f255..66c32c0 100644
--- a/Src/CharTools.h
+++ b/Src/CharTools.h
@@ -8,34 +8,28 @@
 class CharTools {
 public:
     //! Checks whether or not `c` is a vowel. You can define custom vowel characters.
-    static bool IsVowel(const char c, const std::string& vowels = "euioay");
+    static bool IsVowel(const char c, const std::string &vowels = "euioay");
 
     //! Returns whether or not `c` is a letter.
     static bool IsLetter(const char c);
 
-    //! Returns whether or not `c` is a generic character (that contains JUST the sign)
-    static bool IsGeneric(const char c);
+    //! Returns whether or not `c` is a digit.
+    static bool IsDigit(const char c);
 
     //! Checks whether or not `c` is an uppercase character.
     static bool IsUpper(const char c);
 
+    //! Checks whether or not `c` is a lowercase character.
+    static bool IsLower(const char c);
+
     //! Will return `c` as an uppercase character.
     static char MakeUpper(char c);
 
     //! Will return `c` as a lowercase character.
     static char MakeLower(char c);
 
-    //! Will return an empty character with the same sign/capitalization as `c`.
-    static char GetSign(char c);
-
     //! Will return `c` with the same capitalization as `sign`.
     static char CopySign(char sign, char c);
-
-    //! Generic uppercase character.
-    static constexpr char UPPERCASE = 0;
-
-    //! Generic lowercase character.
-    static constexpr char LOWERCASE = (1<<5);
 };
 
 #endif //STRINGTOOLS_CHARTOOLS_H