cleanup and minor changes

This commit is contained in:
vrd
2023-03-07 21:00:56 +02:00
parent 83d47cbefa
commit 7b05b7c5c1
6 changed files with 67 additions and 279 deletions
+10 -230
View File
@@ -2,247 +2,27 @@
#include "utils.hpp"
#include "parser.hpp"
#include <ncursesw/ncurses.h>
#include <string_view>
/* #include <string_view> */
#include <iostream>
using std::string_view;
using std::cerr;
using namespace std::literals;
/* using std::string_view; */
using std::cout;
/* using namespace std::literals; */
int main(int argc, char* argv[])
{
init();
if(argc < 2)
{
cerr << "Usage: tft FILES...\nTry 'tft --help' for more information";
return 1;
cout << "Usage: tft FILES...\n";
return 0;
}
init();
for(int i = 1; i < argc; ++i)
{
if(string_view(argv[i]) == "--help"sv) /* sv worth it? */
{
/* todo */
return 0; /* todo exit curses */
}
fd_t file = openOrDie(argv[i]);
parseTftFile(file).display();
parseTftFile(argv[i]).display();
}
/* ====================================================== */
/* std::vector<Tree> trees; */
/* bool quit = F; */
/* char input[128]; */
/* short i; //Number of the entered command */
/* const short numCom = 24; */
/* const char* const commandList[] = */
/* { */
/* "quit", //0 */
/* "rename", //1 */
/* "load", //2 */
/* "save", //3 */
/* "addPerson", //4 */
/* "addPersonWP", //5 Adds a person and connects him to his parents, by their number */
/* "addRelation", //6 Adds a relation between two people input by name */
/* "addRelationID", //7 -||- by number */
/* "findID", //8 */
/* "equate", //9 Enter the number of two trees, the second becomes equal to the first */
/* "combine", //10 */
/* "subtract", //11 */
/* "removePerson", //12 */
/* "removePersonID", //13 */
/* "removeRelation", //14 */
/* "removeRelationID", //15 */
/* "addTree", //16 */
/* "prtRelatives", //17 */
/* "prtMember", //18 */
/* "prtAncestors", //19 */
/* "chooseTree", //20 */
/* "prtCommonAncestor", //21 */
/* "prtOldestAncestors",//22 */
/* "prtTree" //23 */
/* }; */
/* unsigned curTree = 0, //Currently selected tree ID */
/* id, secondId; // Person IDs */
/* Tree* newTree; */
/* char name[128], secondName[128]; */
/* U8 day, month; //TODO add h m */
/* U16 year; */
/* bool sex; */
/* unsigned father, mother; // IDs */
/* do */
/* { */
/* clear(); */
/* printw("Enter a command\n"); */
/* refresh(); */
/* // getmaxyx(stdscr,row,col); /\* get the number of rows and columns *\/ */
/* std::cin >> input; */
/* for (i = 0; i < numCom; ++i) */
/* { */
/* if (strComp(input, commandList[i])) */
/* break; */
/* } */
/* switch (i) */
/* { */
/* default: */
/* std::cout << "Unknown command, try again\n\n"; */
/* break; */
/* case 0: //quit */
/* quit = 1; */
/* break; */
/* case 1: //rename */
/* std::cout << "Enter new name\n\n"; */
/* std::cin >> name; */
/* trees[curTree].rename(name); */
/* break; */
/* case 2: //load */
/* cin >> input; */
/* trees.push(Tree(input)); */
/* if (!trees[trees.gNum() - 1].loadFromFile()) */
/* std::cout << "File doesnt exist or is empty.\n\n"; */
/* break; */
/* case 3: //save */
/* trees[curTree].saveToFile(); */
/* break; */
/* case 4: //addPerson */
/* std::cin >> name >> day >> month >> year >> sex; */
/* trees[curTree].addPerson(name, sex, Nobody, Nobody, EventTime(year, month, day)); */
/* break; */
/* case 5: //addPersonWP */
/* std::cin >> name >> day >> month >> year >> sex >> father >> mother; */
/* trees[curTree].addPerson(name, sex, father, mother, EventTime(year, month, day)); */
/* break; */
/* case 6: //addRelation */
/* std::cin >> name >> input >> secondName; */
/* while (!strToRel(input)) */
/* { */
/* std::cout << "Invalid Relation, try again!\n"; */
/* std::cin >> input; */
/* } */
/* if(!trees[curTree].addRelation(name, strToRel(input), secondName)) */
/* std::cout << "Failure! One or both of the relatives don't exist.\n\n"; */
/* break; */
/* case 7: //addRelationID */
/* std::cin >> id >> input >> secondId; */
/* while (!strToRel(input)) */
/* { */
/* std::cout << "Invalid Relation, try again!\n"; */
/* std::cin >> input; */
/* } */
/* if(trees[curTree].addRelation(id, strToRel(input), secondId)) */
/* std::cout << "Failure! One or both of the relatives don't exist.\n\n"; */
/* break; */
/* case 8: //findID */
/* std::cin >> name; */
/* id = trees[curTree].findId(name); */
/* if (id == Nobody) */
/* std::cout << "No such person in tree " << curTree <<"\n\n"; */
/* else */
/* std::cout << id << "\n\n"; */
/* break; */
/* case 9: //equate */
/* std::cin >> id >> secondId; */
/* trees[id] = trees[secondId]; */
/* break; */
/* case 10: //combine */
/* std::cin >> id >> secondId; */
/* trees[id] += trees[secondId]; */
/* break; */
/* case 11: //subtract */
/* std::cin >> id >> secondId; */
/* trees[id] -= trees[secondId]; */
/* break; */
/* case 12: //removePerson */
/* std::cin >> name; */
/* if (trees[curTree].findId(name) != Nobody) */
/* trees[curTree].removePerson(name); */
/* else */
/* std::cout << "No such member!\n\n"; */
/* break; */
/* case 13: //removePersonID */
/* std::cin >> id; */
/* if (trees[curTree].gNumP() > id) */
/* trees[curTree].removePerson(id); */
/* else */
/* std::cout << "No such member!\n\n"; */
/* break; */
/* case 14: //removeRelation */
/* std::cin >> name >> secondName; */
/* if (trees[curTree].gNumP() > trees[curTree].findId(name) && trees[curTree].gNumP() > trees[curTree].findId(secondName)) */
/* trees[curTree].removeRelation(name, secondName); */
/* else */
/* std::cout << "No such member!\n\n"; */
/* break; */
/* case 15: //removeRelationID */
/* std::cin >> id >> secondId; */
/* if (trees[curTree].gNumP() > id && trees[curTree].gNumP() > secondId) */
/* trees[curTree].removeRelation(id, secondId); */
/* else */
/* std::cout << "No such member\n\n"; */
/* break; */
/* case 16: //addTree */
/* std::cin >> name; */
/* newTree = new Tree(name); */
/* trees.push(*newTree); */
/* delete newTree; */
/* break; */
/* case 17: //printRelatives */
/* std::cin >> id; */
/* if (id < trees[curTree].gNumP()) */
/* trees[curTree].printRel(id); */
/* else */
/* std::cout << "No such member\n\n"; */
/* break; */
/* case 18: //printMember */
/* std::cin >> id; */
/* if (id < trees[curTree].gNumP()) */
/* trees[curTree].printMember(id); */
/* else */
/* std::cout << "No such member\n\n"; */
/* break; */
/* case 19: //printAncestors */
/* std::cin >> id; */
/* /\*if (id < trees[curTree].gNumP()) */
/* trees[curTree].printAncestors(id); */
/* else */
/* std::cout << "No such member\n\n";*\/ */
/* break; */
/* case 20: //chooseTree */
/* std::cout << "Enter tree ID\n\n"; */
/* std::cin >> id; */
/* if (id < trees.gNum()) */
/* curTree = id; */
/* else */
/* std::cout << "No such tree\n\n"; */
/* break; */
/* case 21: //prtCommonAncestor */
/* std::cin >> id >> secondId; */
/* if (id < trees[curTree].gNumP() || secondId < trees[curTree].gNumP()) */
/* trees[curTree].printMember(trees[curTree].findCommonAncestor(id, secondId)); */
/* else */
/* std::cout << "No such member\n\n"; */
/* break; */
/* case 22: //prtOldestAncestors */
/* std::cin >> id; */
/* if (id < trees[curTree].gNumP()) */
/* trees[curTree].printOldestAncestors(id); */
/* else */
/* std::cout << "No such member\n\n"; */
/* break; */
/* case 23: */
/* trees[curTree].print(); */
/* break; */
/* } */
/* } while (!quit); */
/* TFT_EXIT(0); */
return 0;
}