diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dab1a1..43d23dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,17 +27,28 @@ target_include_directories(syntaxer PRIVATE ) add_executable(tester) - target_sources(tester PRIVATE src/test.cpp ) - target_include_directories(tester PRIVATE ${GLOBAL_INC} ${CMAKE_CURRENT_SOURCE_DIR}/src ) - target_link_libraries(tester PRIVATE parser syntaxer ) + +add_executable(main) +target_sources(main PRIVATE + src/main.cpp +) + +target_include_directories(main PRIVATE + ${GLOBAL_INC} +) + +target_link_libraries(main PRIVATE + parser + syntaxer +) diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..e31310a --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,14 @@ +#include "parser.hpp" +#include "syntaxer.hpp" + +int main(int argc, char **argv) +{ + if (argc != 2) + { + return 1; + } + + std::vector tv = Parser::tokenize_input(argv[1]); + Syntax::apply_corrections(tv); + std::vector ov = Syntax::build_op_vector(tv); +} diff --git a/src/parser.cpp b/src/parser.cpp index ab08dfd..4fb99f2 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -386,7 +386,7 @@ void print_math_vector(const std::vector& tv) int i, l; for (i = 0, l = tv.size() - 1; i < l; i++) { - std::cout << *tv[i].to_math_str() << " "; + std::cout << *tv[i].to_math_str(); //<< " "; } std::cout << *tv[i].to_math_str() << "\n";