added config

Author: JakeyGilly

Makefile

@@ -4,10 +4,10 @@ else
  TARGET = Compactifier.out
 endif
 
-SOURCE= src/main.cpp src/fileio.cpp src/formatting/global.cpp src/formatting/languages/python/formatter.cpp
-HEADER= headers/fileio.hpp headers/formatting.hpp
+SOURCE= src/main.cpp src/fileio.cpp src/formatting/global.cpp src/formatting/languages/python/formatter.cpp src/config.cpp
+HEADER= headers/fileio.hpp headers/formatting.hpp headers/config.hpp
 CC	= g++
-FLAGS= -Wall -std=c++20
+FLAGS= -Wall -std=c++20 -g
 
 all: $(OBJS)
 $(CC) ${SOURCE} -o $(TARGET) ${FLAGS}

config.cfg

@@ -0,0 +1,8 @@
+# =============================================================================
+#
+# CompactifierPlusPlus V1.0 
+# Configuration file for the CompactifierPlusPlus 
+#
+# =============================================================================
+
+MAX_INDENT_SPACE = 16

src/config.cpp

@@ -0,0 +1,47 @@
+#include <iostream>
+#include <string>
+#include <algorithm>
+#include <vector>
+#include "headers/fileio.hpp"
+
+#define CONFIG_FILE "config.cfg"
+
+std::vector<std::pair<std::string, std::string>> pharseConfig() {
+ std::vector<std::string> fileContents = readFile(CONFIG_FILE);
+ std::vector<std::pair<std::string, std::string>> config;
+ for (int i = 0; i < fileContents.size(); i++) {
+ if (fileContents[i][0] == '#') continue; // comments
+ if (fileContents[i][0] == '\n') continue; // empty lines
+ if (fileContents[i][0] == '\r') continue; // empty lines
+ if (fileContents[i].find("=") == std::string::npos) continue; // no =
+ fileContents[i].erase(std::remove(fileContents[i].begin(), fileContents[i].end(), ' '), fileContents[i].end());
+ std::string key = fileContents[i].substr(0, fileContents[i].find("="));
+ std::string value = fileContents[i].substr(fileContents[i].find("=") + 1);
+ config.push_back(std::make_pair(key, value));
+ }
+ std::cout << "Config file loaded" << std::endl;
+ // print keys loaded
+ std::string keys;
+ for (int i = 0; i < config.size(); i++) {
+ keys += config[i].first + ", ";
+ }
+ std::cout << "Loaded Keys: " << keys << std::endl;
+ return config;
+}
+
+bool checkKey(std::string key) {
+ std::vector<std::pair<std::string, std::string>> config = pharseConfig();
+ for (int i = 0; i < config.size(); i++) {
+ if (config[i].first == key) return true;
+ }
+ return false;
+}
+
+std::string getValue(std::string key) {
+ std::vector<std::pair<std::string, std::string>> config = pharseConfig();
+ for (int i = 0; i < config.size(); i++) {
+ if (config[i].first == key) return config[i].second;
+ }
+ return "";
+}
+

src/formatting/languages/python/formatter.cpp

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <vector>
 #include "../../../headers/formatting.hpp"
+#include "../../../headers/config.hpp"
 
 #define PYTHON_ANNATATION "#" // Single line comment
 #define PYTHON_ML_ANNATATION "\"\"\"" // Multi line comment
@@ -37,8 +38,7 @@ void pyFormat(std::vector<std::string> &fileContents) {
 }
 for (int i = 0; i < spacesVec.size(); i++) {
 if (spacesVec[i] > 0) {
-// get max spaces from config
-for (int j = 12; j > 1; j--) {
+for (int j = stoi(getValue("MAX_INDENT_SPACE")); j > 1; j--) {
 if (spacesVec[i] % j == 0) {
 indentation = j;
 break;
@@ -65,6 +65,7 @@ void pyFormat(std::vector<std::string> &fileContents) {
 }
 
 // replace spaces with tabs
+// check each module succeeds
 // remove multiple spaces after text and before newline
 // remove blank lines
 // while ((pos=fileContents.find("\n\n", 0)) != -1) { fileContents.erase(pos, 1); }

src/headers/config.hpp

@@ -0,0 +1,3 @@
+std::vector<std::pair<std::string, std::string>> pharseConfig();
+bool checkKey(std::string);
+std::string getValue(std::string);