diff --git a/Lab2CPP/lab2.cpp b/Lab2CPP/lab2.cpp index 93ccc1376..b7be72b4f 100644 --- a/Lab2CPP/lab2.cpp +++ b/Lab2CPP/lab2.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "../LibraryCPP/list.h" -#include "../LibraryCPP/stack.h" +#include "list.h" +#include "stack.h" unsigned int priority(const char symbol) { @@ -110,10 +110,15 @@ std::string calculate(std::string expr) return expr; } -int main() +int main(int argc, char** argv) { std::string data = ""; - std::cin >> data; + char* ch = argv[1]; + while (*ch != '\0') + { + data += *(ch); + ch++; + } std::cout << calculate(data); return 0; }