Refactor ConfigFile.cpp to be simpler

src/ConfigUtils.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <assert.h>
-
 #include <map>
 #include <string>
 #include <vector>
@@ -41,8 +39,6 @@ enum class ConfigSetting
   HFileName = 37,
   // Bools
   GenerateHFile = 64,
-  // Other
-  Invalid = 1024
 };
 
 struct ConfigUtils
@@ -91,8 +87,6 @@ struct ConfigUtils
         return "sourcefile";
       case ConfigSetting::IncludeDirExclDep:
         return "includedirexcldep";
-      case ConfigSetting::Invalid:
-        return "invalid";
     }
     return "";
   }
@@ -122,7 +116,6 @@ struct ConfigUtils
       case ConfigSetting::ExecArgument:
       case ConfigSetting::GenerateHFile:
       case ConfigSetting::SourceFile:
-      case ConfigSetting::Invalid:
         return false;
     }
     return false;
@@ -153,7 +146,6 @@ struct ConfigUtils
       case ConfigSetting::GenerateHFile:
       case ConfigSetting::SourceFile:
       case ConfigSetting::IncludeDirExclDep:
-      case ConfigSetting::Invalid:
         return false;
     }
     return false;
@@ -184,7 +176,6 @@ struct ConfigUtils
       case ConfigSetting::ProjectName:
       case ConfigSetting::HFileName:
       case ConfigSetting::GenerateHFile:
-      case ConfigSetting::Invalid:
         return false;
     }
     return false;
@@ -214,7 +205,6 @@ struct ConfigUtils
       case ConfigSetting::ExecPreArgument:
       case ConfigSetting::ExecArgument:
       case ConfigSetting::SourceFile:
-      case ConfigSetting::Invalid:
       case ConfigSetting::IncludeDirExclDep:
         return false;
     }
@@ -240,8 +230,7 @@ struct ConfigUtils
       case ConfigSetting::GenerateHFile:
         return GetDefaultSettingBool(setting) ? "true" : "false";
       default:
-        LOG_ERROR("INVALID STRING ENUM: ", (int)setting);
-        assert(false);
+        ASSERT(false, "INVALID STRING ENUM: ", (int)setting);
     }
     return "";
   }
@@ -253,8 +242,7 @@ struct ConfigUtils
       case ConfigSetting::GenerateHFile:
         return false;
       default:
-        LOG_ERROR("NOT BOOLEAN VALUE: ", (int)setting);
-        assert(false);
+        ASSERT(false, "NOT BOOLEAN VALUE: ", (int)setting);
     }
   }