From 3cdf1f439c65e2cd053a4d88f046395e66698af6 Mon Sep 17 00:00:00 2001 From: Brandon Rozek Date: Wed, 26 Sep 2018 19:28:55 -0400 Subject: [PATCH] Changed extensions from C style to C++ style --- Makefile | 28 +++++++++---------- src/{constants.h => constants.hpp} | 0 src/{main.c => main.cpp} | 4 +-- src/operations/{node.c => node.cpp} | 10 +++---- src/operations/{node.h => node.hpp} | 4 +-- src/operations/{operators.c => operators.cpp} | 4 +-- src/operations/{operators.h => operators.hpp} | 2 +- src/parser/lexer.l | 4 +-- src/parser/{parser.h => parser.hpp} | 0 src/parser/parser.y | 6 ++-- src/{shell.c => shell.cpp} | 10 +++---- src/{shell.h => shell.hpp} | 0 src/sloth.h | 12 -------- src/sloth.hpp | 12 ++++++++ .../{environment.c => environment.cpp} | 4 +-- .../{environment.h => environment.hpp} | 0 src/variables/{value.c => value.cpp} | 2 +- src/variables/{value.h => value.hpp} | 0 src/variables/{variable.c => variable.cpp} | 2 +- src/variables/{variable.h => variable.hpp} | 2 +- 20 files changed, 53 insertions(+), 53 deletions(-) rename src/{constants.h => constants.hpp} (100%) rename src/{main.c => main.cpp} (95%) rename src/operations/{node.c => node.cpp} (98%) rename src/operations/{node.h => node.hpp} (91%) rename src/operations/{operators.c => operators.cpp} (99%) rename src/operations/{operators.h => operators.hpp} (95%) rename src/parser/{parser.h => parser.hpp} (100%) rename src/{shell.c => shell.cpp} (92%) rename src/{shell.h => shell.hpp} (100%) delete mode 100644 src/sloth.h create mode 100644 src/sloth.hpp rename src/variables/{environment.c => environment.cpp} (95%) rename src/variables/{environment.h => environment.hpp} (100%) rename src/variables/{value.c => value.cpp} (99%) rename src/variables/{value.h => value.hpp} (100%) rename src/variables/{variable.c => variable.cpp} (96%) rename src/variables/{variable.h => variable.hpp} (93%) diff --git a/Makefile b/Makefile index 18048db..f1a98fe 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GPP = g++ -Wall -std=c++17 -sloth: src/main.c src/parser/lex.yy.o src/parser/parser.tab.o src/variables/environment.o src/variables/variable.o src/variables/value.o src/operations/node.o src/operations/operators.o src/string.o src/shell.o - $(GPP) src/main.c src/parser/lex.yy.o src/parser/parser.tab.o src/variables/environment.o src/variables/variable.o src/variables/value.o src/operations/node.o src/operations/operators.o src/string.o src/shell.o -ledit -o sloth +sloth: src/main.cpp src/parser/lex.yy.o src/parser/parser.tab.o src/variables/environment.o src/variables/variable.o src/variables/value.o src/operations/node.o src/operations/operators.o src/string.o src/shell.o + $(GPP) src/main.cpp src/parser/lex.yy.o src/parser/parser.tab.o src/variables/environment.o src/variables/variable.o src/variables/value.o src/operations/node.o src/operations/operators.o src/string.o src/shell.o -ledit -o sloth src/parser/lex.yy.o: src/parser/lex.yy.c src/parser/parser.tab.h $(GPP) -c src/parser/lex.yy.c -o src/parser/lex.yy.o src/parser/parser.tab.o: src/parser/parser.tab.c @@ -12,18 +12,18 @@ src/parser/parser.tab.c: src/parser/parser.y bison -d -o src/parser/parser.tab.c src/parser/parser.y src/parser/lex.yy.c: src/parser/lexer.l flex -o src/parser/lex.yy.c src/parser/lexer.l -src/variables/environment.o: src/variables/environment.h src/variables/environment.c - $(GPP) -c src/variables/environment.c -o src/variables/environment.o -src/variables/variable.o: src/variables/variable.h src/variables/variable.c - $(GPP) -c src/variables/variable.c -o src/variables/variable.o -src/variables/value.o: src/variables/value.h src/variables/value.h - $(GPP) -c src/variables/value.c -o src/variables/value.o -src/operations/operators.o: src/operations/operators.h src/operations/operators.c - $(GPP) -c src/operations/operators.c -o src/operations/operators.o -src/operations/node.o: src/operations/node.h src/operations/node.c - $(GPP) -c src/operations/node.c -o src/operations/node.o -src/shell.o: src/shell.h src/shell.c - $(GPP) -c src/shell.c -o src/shell.o +src/variables/environment.o: src/variables/environment.hpp src/variables/environment.cpp + $(GPP) -c src/variables/environment.cpp -o src/variables/environment.o +src/variables/variable.o: src/variables/variable.hpp src/variables/variable.cpp + $(GPP) -c src/variables/variable.cpp -o src/variables/variable.o +src/variables/value.o: src/variables/value.hpp src/variables/value.cpp + $(GPP) -c src/variables/value.cpp -o src/variables/value.o +src/operations/operators.o: src/operations/operators.hpp src/operations/operators.cpp + $(GPP) -c src/operations/operators.cpp -o src/operations/operators.o +src/operations/node.o: src/operations/node.hpp src/operations/node.cpp + $(GPP) -c src/operations/node.cpp -o src/operations/node.o +src/shell.o: src/shell.hpp src/shell.cpp + $(GPP) -c src/shell.cpp -o src/shell.o src/string.o: src/string.h src/string.c $(GPP) -c src/string.c -o src/string.o clean: diff --git a/src/constants.h b/src/constants.hpp similarity index 100% rename from src/constants.h rename to src/constants.hpp diff --git a/src/main.c b/src/main.cpp similarity index 95% rename from src/main.c rename to src/main.cpp index 1f7e5f1..b94def6 100644 --- a/src/main.c +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include #include -#include "sloth.h" -#include "shell.h" +#include "sloth.hpp" +#include "shell.hpp" void interpret_file(char* fileName); diff --git a/src/operations/node.c b/src/operations/node.cpp similarity index 98% rename from src/operations/node.c rename to src/operations/node.cpp index 321f1a1..fc4d5a1 100644 --- a/src/operations/node.c +++ b/src/operations/node.cpp @@ -2,12 +2,12 @@ #include #include #include -#include "node.h" -#include "operators.h" -#include "../constants.h" +#include "node.hpp" +#include "operators.hpp" +#include "../constants.hpp" #include "../parser/parser.tab.h" -#include "../variables/value.h" -#include "../variables/variable.h" +#include "../variables/value.hpp" +#include "../variables/variable.hpp" /* creates a new node and returns it */ struct Node* make_node(int type, struct Value* value, std::string id) { diff --git a/src/operations/node.h b/src/operations/node.hpp similarity index 91% rename from src/operations/node.h rename to src/operations/node.hpp index 16af7cb..c9d65ec 100644 --- a/src/operations/node.h +++ b/src/operations/node.hpp @@ -2,8 +2,8 @@ #define NODE_H #include -#include "../variables/value.h" -#include "../variables/environment.h" +#include "../variables/value.hpp" +#include "../variables/environment.hpp" #define ID_SIZE 100 #define MAX_CHILDREN 3 diff --git a/src/operations/operators.c b/src/operations/operators.cpp similarity index 99% rename from src/operations/operators.c rename to src/operations/operators.cpp index ba6b496..85b11e3 100644 --- a/src/operations/operators.c +++ b/src/operations/operators.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "operators.h" -#include "../variables/value.h" +#include "operators.hpp" +#include "../variables/value.hpp" struct Value* add(struct Value* x, struct Value* y) { if (!x || !y) { fprintf(stderr, "Error, uninitialized values being used in add.\n"); } diff --git a/src/operations/operators.h b/src/operations/operators.hpp similarity index 95% rename from src/operations/operators.h rename to src/operations/operators.hpp index 9bb8c5b..9360d7c 100644 --- a/src/operations/operators.h +++ b/src/operations/operators.hpp @@ -1,6 +1,6 @@ #ifndef OPERATORS_H #define OPERATORS_H -#include "../variables/value.h" +#include "../variables/value.hpp" struct Value* add(struct Value* x, struct Value* y); struct Value* subtract(struct Value* x, struct Value* y); diff --git a/src/parser/lexer.l b/src/parser/lexer.l index b5126b9..c08a861 100644 --- a/src/parser/lexer.l +++ b/src/parser/lexer.l @@ -1,8 +1,8 @@ %{ #include #include -#include "../operations/node.h" -#include "../variables/value.h" +#include "../operations/node.hpp" +#include "../variables/value.hpp" #include "parser.tab.h" #include "../string.h" diff --git a/src/parser/parser.h b/src/parser/parser.hpp similarity index 100% rename from src/parser/parser.h rename to src/parser/parser.hpp diff --git a/src/parser/parser.y b/src/parser/parser.y index a9d7313..c164f56 100644 --- a/src/parser/parser.y +++ b/src/parser/parser.y @@ -1,9 +1,9 @@ %{ #include #include -#include "parser.h" -#include "../operations/node.h" -#include "../constants.h" +#include "parser.hpp" +#include "../operations/node.hpp" +#include "../constants.hpp" %} diff --git a/src/shell.c b/src/shell.cpp similarity index 92% rename from src/shell.c rename to src/shell.cpp index 1cac0bf..39cc239 100644 --- a/src/shell.c +++ b/src/shell.cpp @@ -1,10 +1,10 @@ #include #include -#include "shell.h" -#include "parser/parser.h" -#include "variables/environment.h" -#include "operations/node.h" -#include "constants.h" +#include "shell.hpp" +#include "parser/parser.hpp" +#include "variables/environment.hpp" +#include "operations/node.hpp" +#include "constants.hpp" // For keeping track of command history diff --git a/src/shell.h b/src/shell.hpp similarity index 100% rename from src/shell.h rename to src/shell.hpp diff --git a/src/sloth.h b/src/sloth.h deleted file mode 100644 index f083197..0000000 --- a/src/sloth.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef SLOTH_H -#define SLOTH_H - -#include "constants.h" -#include "operations/node.h" -#include "variables/value.h" -#include "variables/variable.h" -#include "variables/environment.h" -#include "parser/parser.h" -#include "parser/parser.tab.h" - -#endif diff --git a/src/sloth.hpp b/src/sloth.hpp new file mode 100644 index 0000000..cf8e02c --- /dev/null +++ b/src/sloth.hpp @@ -0,0 +1,12 @@ +#ifndef SLOTH_H +#define SLOTH_H + +#include "constants.hpp" +#include "operations/node.hpp" +#include "variables/value.hpp" +#include "variables/variable.hpp" +#include "variables/environment.hpp" +#include "parser/parser.hpp" +#include "parser/parser.tab.h" + +#endif diff --git a/src/variables/environment.c b/src/variables/environment.cpp similarity index 95% rename from src/variables/environment.c rename to src/variables/environment.cpp index 74f99c6..255a329 100644 --- a/src/variables/environment.c +++ b/src/variables/environment.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "environment.h" -#include "variable.h" +#include "environment.hpp" +#include "variable.hpp" struct Environment* create_environment(void) { struct Environment* env = new Environment(); diff --git a/src/variables/environment.h b/src/variables/environment.hpp similarity index 100% rename from src/variables/environment.h rename to src/variables/environment.hpp diff --git a/src/variables/value.c b/src/variables/value.cpp similarity index 99% rename from src/variables/value.c rename to src/variables/value.cpp index b3f2b81..acb0cea 100644 --- a/src/variables/value.c +++ b/src/variables/value.cpp @@ -1,5 +1,5 @@ #include -#include "value.h" +#include "value.hpp" #include #include #include "../parser/parser.tab.h" diff --git a/src/variables/value.h b/src/variables/value.hpp similarity index 100% rename from src/variables/value.h rename to src/variables/value.hpp diff --git a/src/variables/variable.c b/src/variables/variable.cpp similarity index 96% rename from src/variables/variable.c rename to src/variables/variable.cpp index 9b6c942..6261bef 100644 --- a/src/variables/variable.c +++ b/src/variables/variable.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "variable.h" +#include "variable.hpp" /* creates a new variable and returns it */ struct Variable* make_variable(char* id, struct Value* value) { diff --git a/src/variables/variable.h b/src/variables/variable.hpp similarity index 93% rename from src/variables/variable.h rename to src/variables/variable.hpp index 766d571..7138076 100644 --- a/src/variables/variable.h +++ b/src/variables/variable.hpp @@ -1,7 +1,7 @@ #ifndef VARIABLE_H #define VARIABLE_H -#include "../operations/node.h" +#include "../operations/node.hpp" struct Variable { char id[ID_SIZE];