add template to stack

ShuntingYard.cpp

@@ -1,8 +1,8 @@
 #include "ShuntingYard.h"
 
-stack ShuntingYard::getNotation(string &line) {
-    stack queue;
-    stack array;
+stack<string> ShuntingYard::getNotation(string &line) {
+    stack<string> queue;
+    stack<string> array;
     string current;
     for (int i = 0; i < line.length(); ++i) {
         ifUnary(i, line);
@@ -22,7 +22,7 @@ stack ShuntingYard::getNotation(string &line) {
     return queue;
 }
 
-void ShuntingYard::pushOperation(stack &array, stack &queue, string &current) {
+void ShuntingYard::pushOperation(stack<string> &array, stack<string> &queue, string &current) {
     if (!array.isEmpty()) {
         string temp = array.getElement();
         if (getPrecedence(current) <= getPrecedence(temp) && !getAssociativity(current) ||
@@ -35,15 +35,15 @@ void ShuntingYard::pushOperation(stack &array, stack &queue, string &current) {
 }
 
 
-void ShuntingYard::takeCashBack(stack &array, stack &queue) {
+void ShuntingYard::takeCashBack(stack<string> &array, stack<string> &queue) {
     while (!array.isEmpty()) {
         string current = array.getElement();
         queue.addElement(current);
         array.deleteElement();
     }
 }
 
-void ShuntingYard::pushScope(stack &array, stack &queue) {
+void ShuntingYard::pushScope(stack<string> &array, stack<string> &queue) {
     while (!array.isEmpty()) {
         string current = array.getElement();
         if (current == "(") {

ShuntingYard.h

@@ -7,17 +7,17 @@
 using namespace std;
 
 class ShuntingYard {
-    static void pushScope(stack &array, stack &queue);
+    static void pushScope(stack<string> &array, stack<string> &queue);
 
-    static void pushOperation(stack &array, stack &queue, string &current);
+    static void pushOperation(stack<string> &array, stack<string> &queue, string &current);
 
-    static void takeCashBack(stack &array, stack &queue);
+    static void takeCashBack(stack<string> &array, stack<string> &queue);
 
     static string getNumber(int &start, string &line);
 
     static void ifUnary(int index, string &line);
 
 public:
-    static stack getNotation(string &line);
+    static stack<string> getNotation(string &line);
 
 };

calc.cpp

@@ -1,6 +1,6 @@
 #include "calc.h"
 
-double calc(stack &queue, string &sign) {
+double calc(stack<string> &queue, string &sign) {
     queue.deleteElement();
     double a, b;
 
@@ -12,7 +12,7 @@ double calc(stack &queue, string &sign) {
     return operation(a, b, sign);
 }
 
-double getValue(stack &queue, string &sign) {
+double getValue(stack<string> &queue, string &sign) {
     if (!queue.isEmpty()) {
         string current = queue.getElement();
         if (isNumber(current)) {

calc.h

@@ -9,9 +9,9 @@ using namespace std;
 
 double operation(double a, double b, string &operation);
 
-double calc(stack &queue, string &sign);
+double calc(stack<string> &queue, string &sign);
 
-double getValue(stack &queue, string &sign);
+double getValue(stack<string> &queue, string &sign);
 
 double toDouble(string &item);
 

main.cpp

@@ -4,18 +4,19 @@
 
 int main(int size, char *arg[]) {
     string line;
-    for (int i = 1; i < size; ++i) {
-        line += arg[i];
-    }
-    if (!line.empty()) {
-        stack notation = ShuntingYard::getNotation(line);
-        if (notation.getSize() == 1){
-            cout << "Result: " << notation.getElement();
-        }
-        else{
-            string sign = notation.getElement();
-            cout << "Result: " << calc(notation, sign);
-        }
+//    for (int i = 1; i < size; ++i) {
+//        line += arg[i];
+//    }
+//    if (!line.empty()) {
+    getline(cin, line);
+    stack<string> notation = ShuntingYard::getNotation(line);
+    if (notation.getSize() == 1) {
+        cout << "Result: " << notation.getElement();
+    } else {
+        notation.show();
+        string sign = notation.getElement();
+        cout << "Result: " << calc(notation, sign);
     }
+//    }
     return 0;
 }

stack.cpp

@@ -1,67 +1 @@
 #include "stack.h"
-
-stack::stack() {
-    size = 0;
-    maxSize = 1;
-    array = new string[maxSize];
-}
-
-stack::~stack() {
-    delete[] array;
-}
-
-void stack::addElement(string &elem) {
-    if (size + 1 > maxSize){
-        resize();
-    }
-    array[size] = elem;
-    size++;
-}
-
-string stack::getElement() {
-    return array[size - 1];
-}
-
-void stack::deleteElement() {
-    if (!isEmpty()){
-        size--;
-    }
-}
-
-bool stack::isEmpty() {
-    if (size == 0){
-        return true;
-    }
-    return false;
-}
-
-int stack::getSize() const {
-    return size;
-}
-
-void stack::show() {
-    for (int i = 0; i < size; ++i) {
-        cout << array[i] << " ";
-    }
-    cout << endl;
-}
-
-void stack::reverse() {
-    auto *new_array = new string[maxSize];
-    for (int i = 0; i < size; ++i) {
-        new_array[i] = array[size - 1 - i];
-    }
-    delete[] array;
-    array = new_array;
-}
-
-void stack::resize() {
-    maxSize *= 2;
-    string *new_array = new string[maxSize];
-    for (int i = 0; i < size; ++i) {
-        new_array[i] = array[i];
-    }
-    delete[] array;
-    array = new_array;
-
-}

stack.h

@@ -4,31 +4,66 @@
 
 using namespace std;
 
+template<typename T>
 class stack {
     int size;
-    string *array;
+    T *array;
     int maxSize;
 
 public:
-    stack();
+    stack() {
+        size = 0;
+        maxSize = 1;
+        array = new T[maxSize];
+    };
 
-    ~stack();
+    ~stack() {
+        delete[] array;
+    };
 
-    void addElement(string&);
+    void addElement(T& elem) {
+        if (size + 1 > maxSize) {
+            resize();
+        }
+        array[size] = elem;
+        size++;
+    };
 
-    string getElement();
+    T getElement() {
+        return array[size - 1];
+    };
 
-    void deleteElement();
+    void deleteElement() {
+        if (!isEmpty()) {
+            size--;
+        }
+    };
 
-    void show();
+    void show(){
+        for (int i = 0; i < size; ++i) {
+            cout << array[i] << " ";
+        }
+        cout << endl;
+    };
 
-    bool isEmpty();
+    bool isEmpty(){
+        return (size == 0);
+    };
 
-    int getSize() const;
+    int getSize() const{
+        return size;
+    };
 
-    void reverse();
+    void resize(){
+        maxSize *= 2;
+        T *new_array = new T[maxSize];
+        for (int i = 0; i < size; ++i) {
+            new_array[i] = array[i];
+        }
+        delete[] array;
+        array = new_array;
 
-    void resize();
+    };
 
 
 };