some cleanup

alaindef · alaindef · commit 0a80df7e6792 · 2024-04-22T23:33:34.000+02:00
diff --git a/calculator.cpp b/calculator.cpp
@@ -14,25 +14,25 @@ float calc(std::vector<RPNToken>& tokenlist, VarTable * vartabel){
 
     //remember that operands will be eaten in reverse order
     switch (last.opcode) {
-    case OC::NUM:   res = last.value;                                   break;
-    case OC::VAR:   res = vartabel->getValue((int)last.value);            break;
+    case OC::NUM:   res = last.value;                                                       break;
+    case OC::VAR:   res = vartabel->getValue((int)last.value);                              break;
     case OC::MUL:   res = calc(tokenlist, vartabel) * calc(tokenlist, vartabel);            break;
     case OC::DIV:   v1  = calc(tokenlist, vartabel);  res = calc(tokenlist, vartabel)/v1;   break;
     case OC::ADD:   res = calc(tokenlist, vartabel) + calc(tokenlist, vartabel);            break;
     case OC::SUB:   v1  = calc(tokenlist, vartabel);  res = calc(tokenlist, vartabel) - v1; break;
-    case OC::PAS:   res = calc(tokenlist, vartabel);                              break;
-    case OC::CHS:   res = -calc(tokenlist, vartabel);                             break;
+    case OC::PAS:   res = calc(tokenlist, vartabel);                                        break;
+    case OC::CHS:   res = -calc(tokenlist, vartabel);                                       break;
     case OC::LT:    res = calc(tokenlist, vartabel)   >  calc(tokenlist, vartabel);         break;
     case OC::LE:    res = calc(tokenlist, vartabel)   >= calc(tokenlist, vartabel);         break;
     case OC::GT:    res = calc(tokenlist, vartabel)   <  calc(tokenlist, vartabel);         break;
     case OC::GE:    res = calc(tokenlist, vartabel)   <= calc(tokenlist, vartabel);         break;
     case OC::EQ:    res = calc(tokenlist, vartabel)   == calc(tokenlist, vartabel);         break;
     case OC::NE:    res = calc(tokenlist, vartabel)   != calc(tokenlist, vartabel);         break;
     case OC::ASS:   res = calc(tokenlist, vartabel);
-        vartabel->setVar(tokenlist[cursor-1].value, res); cursor--;                       break;
+        vartabel->setVar(tokenlist[cursor-1].value, res); cursor--;                         break;
     case OC::COL:   v1  = calc(tokenlist, vartabel);  v2=calc(tokenlist, vartabel);
-        res = calc(tokenlist, vartabel)?v2:v1;                                                    break;
-    default:                                                                            break;
+        res = calc(tokenlist, vartabel)?v2:v1;                                              break;
+    default:                                                                                break;
     }
     return res;
 }
diff --git a/calculator.h b/calculator.h
@@ -7,8 +7,6 @@
     void calcandprint(std::vector<RPNToken> &tokenlist, VarTable * vartabel, bool prt);
     float calc(std::vector<RPNToken> &tokenlist, VarTable * vartabel);
 
-    // VarTable * vartab;
-
     static float fun_elv(float x, float y, float z){
         if (x>0.5) return y; else return z;}
     static int cursor;
diff --git a/rpngenerator.cpp b/rpngenerator.cpp
@@ -7,7 +7,6 @@
 
 using namespace std;
 
-
 void expr(Token &tk, TkList tkList, vector<RPNToken> &tokensout);
 void expr1_par(Token &tk, TkList &tkList, vector<RPNToken> &tokensout);
 void expr0_val(Token &tk, TkList &tkList, vector<RPNToken> &tokensout);
@@ -75,7 +74,6 @@ vector<RPNToken> makeRPN(vector<Token> tkListIn)
     // we will move the input token list into a structure TkList, equipped with member funtions
     TkList tkList;
     tkList.tokens = tkListIn;
-
     vector<RPNToken> tokensout;
 
     tokensout.clear();
diff --git a/tokengenerator.cpp b/tokengenerator.cpp
@@ -7,8 +7,6 @@
 
 using namespace std;
 
-vector<float>   varValues;
-
 void printtokengenerator(const vector<Token>& RPNTokens,
                          VarTable *vartabel){
     const string ppOC[20] ={"NUM", "VAR", "MUL", "DIV", "ADD", "SUB", "PAS", "CHS", "LT", "LE", "GT", "GE", "EQ",
diff --git a/vartable.h b/vartable.h
@@ -7,8 +7,6 @@ using namespace std;
 
 struct VarTable
 {
-public:
-
     int getIndex(string name);
     // look for name in the table and return the storage index
     // if not found create a new entry and return the new index

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ using namespace std;`
`7`	`7`
`8`	`8`	`struct VarTable`
`9`	`9`	`{`
`10`		`-public:`
`11`		`-`
`12`	`10`	`int getIndex(string name);`
`13`	`11`	`// look for name in the table and return the storage index`
`14`	`12`	`// if not found create a new entry and return the new index`