diff --git a/Condition.cpp b/Condition.cpp index 80e74b7..eb322ce 100755 --- a/Condition.cpp +++ b/Condition.cpp @@ -24,36 +24,4 @@ Relation equality(string attName, string s, Relation r){ //currently all returned relations are called TEMP Relation new_r("TEMP", new_atts); return new_r; -} - -/* -vector equality(Attribute a, int i){ - for (int i = 0; i < a.getSize(); ++i) { - // - } -} - -vector gt(Attribute a, int i){ - for (int i = 0; i < a.getSize(); ++i) { - // - } -} - -vector lt(Attribute a, int i){ - for (int i = 0; i < a.getSize(); ++i) { - // - } -} - -vector gte(Attribute a, int i){ - for (int i = 0; i < a.getSize(); ++i) { - // - } -} - -vector lte(Attribute a, int i){ - for (int i = 0; i < a.getSize(); ++i) { - // - } -} -*/ +} \ No newline at end of file diff --git a/DBEngine.cpp b/DBEngine.cpp index c8f4a4b..b559c77 100755 --- a/DBEngine.cpp +++ b/DBEngine.cpp @@ -150,7 +150,6 @@ Relation DBEngine::projection(vector input, Relation r){ return temp; } -//test error matching Relation DBEngine::rename(vector newnames, Relation &r){ vector temp; if (r.getSize() != newnames.size()) { @@ -214,7 +213,6 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){ Relation new_r = r1; new_r.setTableName("TEMP"); vector temp; - //bool duplicate = false; int size = 0; diff --git a/DBEngine.h b/DBEngine.h index a35b3a7..a1ebd24 100755 --- a/DBEngine.h +++ b/DBEngine.h @@ -4,7 +4,6 @@ #include #include "Relation.h" -//still in progress class DBEngine{ vector tables; vector commands; diff --git a/Parser.cpp b/Parser.cpp index 6362964..a914061 100755 --- a/Parser.cpp +++ b/Parser.cpp @@ -137,7 +137,6 @@ Relation condition(vector input, Relation &r, DBEngine &engine){ c = input[0].substr(1, input[0].find_last_of("\"") - 1); input.erase(input.begin()); int offset = 0; - //input.erase(input.begin()); if(op == "=="){ for(int i = 0; i < r.getAttributes().size(); ++i){ if(r.getAttributes()[i].getName() == a1.getName()){ @@ -151,8 +150,6 @@ Relation condition(vector input, Relation &r, DBEngine &engine){ } } - //continue stylistic homogenization here - else if(op == "!=") { for(int i = 0; i < r.getAttributes().size(); ++i) @@ -635,7 +632,7 @@ vector createCMD(vector input, DBEngine &engine){ vector a; - while(input[0] != ")") //inserting all values to relation + while(input[0] != ")") { PAttribute temp; @@ -671,7 +668,7 @@ vector createCMD(vector input, DBEngine &engine){ if(input[0] == "(") { - while(input[0] != ")") //inserting all values to relation + while(input[0] != ")") { if (input[0] == ",") @@ -705,9 +702,9 @@ vector createCMD(vector input, DBEngine &engine){ return input; } - else cout<<"Syntax error! 2"< insertCMD(vector input, DBEngine &engine){ @@ -868,8 +865,6 @@ vector updateCMD(vector input, DBEngine &engine){ { input.erase(input.begin()); - //s.push_back(input[0]); - if(input[0].at(0) == '\"') { c.push_back(input[0].substr(1, input[0].find_last_of("\"") - 1)); @@ -950,7 +945,7 @@ vector deleteCMD(vector input, DBEngine &engine) engine.deleteFromRelationCmd(r, temp); } - else cout<<"Syntax error!"<