fixed g++

Author: JakeyGilly

Makefile

@@ -6,11 +6,11 @@ endif
 
 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 -g
+CC	= g++-11
+FLAGS= -Wall -std=c++17 -g
 
 all: $(OBJS)
 $(CC) ${SOURCE} -o $(TARGET) ${FLAGS}
 
 clean:
-rm -f $(TARGET)
+rm -rf $(TARGET) output.py Compactifier.out.dSYM/

config.cfg

@@ -1,7 +1,7 @@
 # =============================================================================
 #
 # CompactifierPlusPlus V1.0 
-# Configuration file for the CompactifierPlusPlus  
+# Configuration file for the CompactifierPlusPlus 
 #
 # =============================================================================
 

src/config.cpp

@@ -9,7 +9,7 @@
 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++) {
+ for (size_t 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
@@ -22,7 +22,7 @@ std::vector<std::pair<std::string, std::string>> pharseConfig() {
  std::cout << "Config file loaded" << std::endl;
  // print keys loaded
  std::string keys;
- for (int i = 0; i < config.size(); i++) {
+ for (size_t i = 0; i < config.size(); i++) {
  keys += config[i].first + ", ";
  }
  std::cout << "Loaded Keys: " << keys << std::endl;
@@ -31,15 +31,15 @@ std::vector<std::pair<std::string, std::string>> pharseConfig() {
 
 bool checkKey(std::string key) {
  std::vector<std::pair<std::string, std::string>> config = pharseConfig();
- for (int i = 0; i < config.size(); i++) {
+ for (size_t 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++) {
+ for (size_t i = 0; i < config.size(); i++) {
  if (config[i].first == key) return config[i].second;
  }
  return "";

src/fileio.cpp

@@ -33,7 +33,7 @@ int fileSize(std::string file) {
 
 void writeFile(std::string file, std::vector<std::string>& contents) {
  std::ofstream in(file);
- for (int i = 0; i < contents.size(); i++) {
+ for (size_t i = 0; i < contents.size(); i++) {
  in << contents[i] << std::endl;
  }
  in.close();

src/formatting/global.cpp

@@ -1,26 +1,27 @@
 #include <string>
 #include <iostream>
 #include <vector>
+#include <algorithm>
 #include "../headers/formatting.hpp"
 
 void removeSingleAnn(std::vector<std::string> &fileContents, std::string ann) {
- for (int i = 0; i < fileContents.size(); i++) {
- if (fileContents[i].find(ann) != -1) {
+ for (size_t i = 0; i < fileContents.size(); i++) {
+ if (fileContents[i].find(ann) != (size_t)-1) {
  fileContents[i] = fileContents[i].substr(0, fileContents[i].find(ann));
  }
  }
 }
 void removeMultiAnn(std::vector<std::string> &fileContents, std::string ann) {
  size_t pos;
  size_t pos2;
- for (int i = 0; i < fileContents.size(); i++) {
- if ((pos=fileContents[i].find(ann)) != -1) {
- if ((pos2=fileContents[i].find(ann, pos + ann.length())) != -1) {
+ for (size_t i = 0; i < fileContents.size(); i++) {
+ if ((pos=fileContents[i].find(ann)) != (size_t)-1) {
+ if ((pos2=fileContents[i].find(ann, pos + ann.length())) != (size_t)-1) {
  fileContents[i] = fileContents[i].substr(0, pos) + fileContents[i].substr(pos2 + ann.length());
  } else {
  fileContents[i] = fileContents[i].substr(0, pos);
  i++;
- while ((pos=fileContents[i].find(ann)) == -1) {
+ while ((pos=fileContents[i].find(ann)) == (size_t)-1) {
  fileContents.erase(fileContents.begin() + i);
  i++;
  }
@@ -31,7 +32,7 @@ void removeMultiAnn(std::vector<std::string> &fileContents, std::string ann) {
 }
 
 void removeEmptyLines(std::vector<std::string> &fileContents) {
- for (int i = 0; i < fileContents.size(); i++) {
+ for (size_t i = 0; i < fileContents.size(); i++) {
 if (fileContents[i].empty()) {
 fileContents.erase(fileContents.begin() + i);
 i--;
@@ -40,15 +41,15 @@ void removeEmptyLines(std::vector<std::string> &fileContents) {
 }
 
 void replaceWinNewLines(std::vector<std::string> &fileContents) {
- for (int i = 0; i < fileContents.size(); i++) {
+ for (size_t i = 0; i < fileContents.size(); i++) {
 fileContents[i].erase(std::remove(fileContents[i].begin(), fileContents[i].end(), '\r'), fileContents[i].end());
 }
 }
 
 void removeBlankLines(std::vector<std::string> &fileContents) {
  bool removeline = true;
-for (int i = 0; i < fileContents.size(); i++) {
-for (int j = 0; j < fileContents[i].length(); j++) if (fileContents[i][j] != ' ' && fileContents[i][j] != '\t') removeline = false;
+for (size_t i = 0; i < fileContents.size(); i++) {
+for (size_t j = 0; j < fileContents[i].length(); j++) if (fileContents[i][j] != ' ' && fileContents[i][j] != '\t') removeline = false;
 if (removeline) {
 fileContents.erase(fileContents.begin() + i);
 i--;
@@ -60,8 +61,8 @@ void removeBlankLines(std::vector<std::string> &fileContents) {
 std::pair<bool,bool> isSpaced(std::vector<std::string> &fileContents) {
  bool isSpaced = false;
 bool error = false;
-for (int i = 0; i < fileContents.size(); i++) {
-if (fileContents[i].find(":") != -1) {
+for (size_t i = 0; i < fileContents.size(); i++) {
+if (fileContents[i].find(":") != (size_t)-1) {
 if (fileContents[i+1][0] == ' ') isSpaced = true;
  else if (fileContents[i+1][0] != '\t') error = true;
 }

src/formatting/languages/python/formatter.cpp

@@ -25,9 +25,9 @@ void pyFormat(std::vector<std::string> &fileContents) {
 std::vector<int> spacesVec;
 int indentation = 0;
 std::cout << "Detected spaced indentation" << std::endl;
-for (int i = 0; i < fileContents.size(); i++) {
+for (size_t i = 0; i < fileContents.size(); i++) {
 spaces = 0;
-for (int j = 0; j < fileContents[i].length(); j++) {
+for (size_t j = 0; j < fileContents[i].length(); j++) {
 if (fileContents[i][j] == ' ') while (fileContents[i][j] == ' ') {
 spaces++;
 j++;
@@ -36,7 +36,7 @@ void pyFormat(std::vector<std::string> &fileContents) {
 }
 spacesVec.push_back(spaces);
 }
-for (int i = 0; i < spacesVec.size(); i++) {
+for (size_t i = 0; i < spacesVec.size(); i++) {
 if (spacesVec[i] > 0) {
 for (int j = stoi(getValue("MAX_INDENT_SPACE")); j > 1; j--) {
 if (spacesVec[i] % j == 0) {
@@ -56,7 +56,7 @@ void pyFormat(std::vector<std::string> &fileContents) {
 std::cin >> indentation;
 }
 // check manually because i dont trust the user
-for (int i = 0; i < spacesVec.size(); i++) {
+for (size_t i = 0; i < spacesVec.size(); i++) {
 if (spacesVec[i] % indentation != 0) {
 std::cout << "Indentation error" << std::endl;
 return;

src/main.cpp

@@ -5,14 +5,13 @@
 #include "headers/formatting.hpp"
 
 int main(int argc, char* argv[]) {
-std::string file; int compact = 0; std::string output; std::string language;
-bool debug = false;
+std::string file; /*int compact = 0;*/ std::string output; std::string language; /*bool debug = false;*/
 for (int i = 0; i < argc - 1; i++) {
 if (!std::strcmp(argv[i], "-f") && isFileReal(argv[i + 1])) file = argv[i + 1];
-if (!std::strcmp(argv[i], "-c")) compact = atoi(argv[i + 1]);
+// if (!std::strcmp(argv[i], "-c")) compact = atoi(argv[i + 1]);
 if (!std::strcmp(argv[i], "-o")) output = argv[i + 1];
 if (!std::strcmp(argv[i], "-l")) language = argv[i + 1];
-if (!std::strcmp(argv[i], "-d")) debug = 1;
+// if (!std::strcmp(argv[i], "-d")) debug = 1;
 if (!std::strcmp(argv[i], "-h")) {
 std::cout << "usage stuff..." << std::endl;
 return 0;