converted strings to vector strings

Author: JakeyGilly

src/fileio.cpp

@@ -1,7 +1,7 @@
 #include <filesystem>
 #include <fstream>
 #include <string>
-#include <sstream>
+#include <vector>
 #include <iostream>
 
 bool isFileReal(std::string file) {
@@ -12,20 +12,29 @@ std::string filetype(std::string file) {
  return std::filesystem::path(file).extension().string();
 }
 
-std::string readFile(std::string file) {
- std::ifstream t(file);
- std::stringstream buffer;
- buffer << t.rdbuf();
- return buffer.str();
+std::vector<std::string> readFile(std::string file) {
+ std::ifstream in(file);
+ if (!in) {
+ return std::vector<std::string>();
+ }
+ std::string str;
+ std::vector<std::string> fileContents;
+ while (std::getline(in, str)) {
+ fileContents.push_back(str);
+ }
+ in.close();
+ return fileContents;
 }
 
 int fileSize(std::string file) {
  std::ifstream in(file, std::ifstream::ate | std::ifstream::binary);
  return (int)in.tellg();
 }
 
-void writeFile(std::string file, std::string contents) {
- std::ofstream infile(file);
- infile << contents;
- infile.close();
+void writeFile(std::string file, std::vector<std::string>& contents) {
+ std::ofstream in(file);
+ for (int i = 0; i < contents.size(); i++) {
+ in << contents[i] << std::endl;
+ }
+ in.close();
 }

src/formatting/global.cpp

@@ -1,30 +1,31 @@
 #include <string>
 #include <iostream>
+#include <vector>
 #include "../headers/formatting.hpp"
 
-std::string removeSingleAnn(std::string fileContents, std::string ann) {
- size_t pos;
- int newline;
- while ((pos = fileContents.find(ann, 0)) != -1) {
- newline = fileContents.find("\n", pos);
- if (newline == -1) {
- fileContents.erase(pos, fileContents.length() - pos);
- } else {
- fileContents.erase(pos, newline - pos);
+void removeSingleAnn(std::vector<std::string> &fileContents, std::string ann) {
+ for (int i = 0; i < fileContents.size(); i++) {
+ if (fileContents[i].find(ann) != -1) {
+ fileContents[i] = fileContents[i].substr(0, fileContents[i].find(ann));
  }
  }
- return fileContents;
 }
-std::string removeMultiAnn(std::string fileContents, std::string ann) {
+void removeMultiAnn(std::vector<std::string> &fileContents, std::string ann) {
  size_t pos;
- int end;
- while ((pos = fileContents.find(ann, 0)) != -1) {
- end = fileContents.find(ann, pos + ann.length());
- if (end == -1) {
- fileContents.erase(pos, fileContents.length() - pos);
- } else {
- fileContents.erase(pos, end - pos + ann.length());
+ 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) {
+ 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) {
+ fileContents.erase(fileContents.begin() + i);
+ i++;
+ }
+ fileContents[i] = fileContents[i].substr(pos + ann.length());
+ }
  }
  }
- return fileContents;
 }

src/formatting/languages/python/formatter.cpp

@@ -6,18 +6,27 @@
 #define PYTHON_ANNATATION "#" // Single line comment
 #define PYTHON_ML_ANNATATION "\"\"\"" // Multi line comment
 
-std::string pyRemoveAnnatations(std::string fileContents) {
-fileContents = removeSingleAnn(fileContents, PYTHON_ANNATATION);
-fileContents = removeMultiAnn(fileContents, PYTHON_ML_ANNATATION);
-return fileContents;
+
+void pyRemoveAnnatations(std::vector<std::string> &fileContents) {
+removeSingleAnn(fileContents, PYTHON_ANNATATION);
+removeMultiAnn(fileContents, PYTHON_ML_ANNATATION);
 }
 
-std::string pyFormat(std::string fileContents) {
-size_t pos;
-fileContents.erase(std::remove(fileContents.begin(), fileContents.end(), '\t'), fileContents.end());
-fileContents.replace(std::remove(fileContents.begin(), fileContents.end(), '\r'), fileContents.end(), "\n");
-while ((pos=fileContents.find("\n\n", 0)) != -1) { fileContents.erase(pos, 1); }
-if (fileContents[fileContents.length() - 1] == '\n') { fileContents.erase(fileContents.length() - 1); }
-if (fileContents[0] == '\n') { fileContents.erase(0, 1); }
-return fileContents;
+void pyFormat(std::vector<std::string> &fileContents) {
+std::cout << "Formatting Python" << std::endl;
+
+// size_t pos;
+
+
+// // replace \r\n with \n
+// fileContents.replace(std::remove(fileContents.begin(), fileContents.end(), '\r'), fileContents.end(), "\n");
+// // replace double newline with one newline
+// while ((pos=fileContents.find("\n\n", 0)) != -1) { fileContents.erase(pos, 1); }
+// // remove newlines at the end of the file and at the beginning of the file
+// if (fileContents[fileContents.length() - 1] == '\n') { fileContents.erase(fileContents.length() - 1); }
+// if (fileContents[0] == '\n') { fileContents.erase(0, 1); }
+// // remove multiple spaces after text and before newline
+// // remove blank lines
+// while ((pos=fileContents.find("\n\n", 0)) != -1) { fileContents.erase(pos, 1); }
+// // remove space around operators > < = ! () [] {} , : ? | &
 }

src/headers/fileio.hpp

@@ -2,6 +2,6 @@
 
 std::string filetype(std::string);
 bool isFileReal(std::string);
-std::string readFile(std::string);
+std::vector<std::string> readFile(std::string);
 int fileSize(std::string);
-void writeFile(std::string, std::string);
+void writeFile(std::string, std::vector<std::string>&);

src/headers/formatting.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 // GLOBAL
-std::string removeSingleAnn(std::string, std::string);
-std::string removeMultiAnn(std::string, std::string);
+void removeSingleAnn(std::vector<std::string>&, std::string);
+void removeMultiAnn(std::vector<std::string>&, std::string);
 
 // PYTHON
-std::string pyRemoveAnnatations(std::string);
-std::string pyFormat(std::string);
+void pyRemoveAnnatations(std::vector<std::string>&);
+void pyFormat(std::vector<std::string>&);

src/main.cpp

@@ -19,15 +19,16 @@ bool debug = false;
 }
 }
 if (!!file.compare("")) {
-std::string fileContents = readFile(file);
+std::vector<std::string> fileContents = readFile(file);
+ if (fileContents.empty()) {
+ std::cout << "File not found" << std::endl;
+ return 1;
+ }
 std::cout << "Opened File " << file << std::endl << "Type " << filetype(file) << std::endl << "File size: " << fileSize(file) << " Bytes" << std::endl;
  // Compaction begins here
  if (!filetype(file).compare(".py")) {
-// struct indentation indent = getIndent(fileContents);
- // std::cout << fileContents << std::endl;
- fileContents = pyRemoveAnnatations(fileContents);
- fileContents = pyFormat(fileContents);
- std::cout << fileContents << std::endl;
+ pyRemoveAnnatations(fileContents);
+ pyFormat(fileContents);
  } else {
  std::cout << "File type not supported" << std::endl;
  }
@@ -44,7 +45,3 @@ bool debug = false;
  std::cout << "usage stuff..." << std::endl;
  }
 }
-
-typedef struct indentation {
-int* indent, lenindent;
-} indentation;