refactor(tests): cleanup compiler tests

YakshaLang · Jun 24, 2023 · a2cf8c2 · a2cf8c2
1 parent a40e242
commit a2cf8c2
Show file tree

Hide file tree

Showing 94 changed files with 79 additions and 65 deletions.
diff --git a/...t_data/compiler_tests/all_integers.tokens → ...compiler_tests/output/all_integers.tokens b/...t_data/compiler_tests/all_integers.tokens → ...compiler_tests/output/all_integers.tokens
diff --git a/...compiler_tests/all_integers.yaka.output.c → ...r_tests/output/all_integers.yaka.output.c b/...compiler_tests/all_integers.yaka.output.c → ...r_tests/output/all_integers.yaka.output.c
diff --git a/...est_data/compiler_tests/array_test.tokens → ...a/compiler_tests/output/array_test.tokens b/...est_data/compiler_tests/array_test.tokens → ...a/compiler_tests/output/array_test.tokens
diff --git a/...a/compiler_tests/array_test.yaka.output.c → ...ler_tests/output/array_test.yaka.output.c b/...a/compiler_tests/array_test.yaka.output.c → ...ler_tests/output/array_test.yaka.output.c
diff --git a/...st_data/compiler_tests/arrnew_test.tokens → .../compiler_tests/output/arrnew_test.tokens b/...st_data/compiler_tests/arrnew_test.tokens → .../compiler_tests/output/arrnew_test.tokens
diff --git a/.../compiler_tests/arrnew_test.yaka.output.c → ...er_tests/output/arrnew_test.yaka.output.c b/.../compiler_tests/arrnew_test.yaka.output.c → ...er_tests/output/arrnew_test.yaka.output.c
diff --git a/.../test_data/compiler_tests/arrstack.tokens → ...ata/compiler_tests/output/arrstack.tokens b/.../test_data/compiler_tests/arrstack.tokens → ...ata/compiler_tests/output/arrstack.tokens
diff --git a/...ata/compiler_tests/arrstack.yaka.output.c → ...piler_tests/output/arrstack.yaka.output.c b/...ata/compiler_tests/arrstack.yaka.output.c → ...piler_tests/output/arrstack.yaka.output.c
diff --git a/...iler_tests/binarydata_builtin_test.tokens → ...sts/output/binarydata_builtin_test.tokens b/...iler_tests/binarydata_builtin_test.tokens → ...sts/output/binarydata_builtin_test.tokens
diff --git a/...sts/binarydata_builtin_test.yaka.output.c → ...put/binarydata_builtin_test.yaka.output.c b/...sts/binarydata_builtin_test.yaka.output.c → ...put/binarydata_builtin_test.yaka.output.c
diff --git a/...t_data/compiler_tests/casting_test.tokens → ...compiler_tests/output/casting_test.tokens b/...t_data/compiler_tests/casting_test.tokens → ...compiler_tests/output/casting_test.tokens
diff --git a/...compiler_tests/casting_test.yaka.output.c → ...r_tests/output/casting_test.yaka.output.c b/...compiler_tests/casting_test.yaka.output.c → ...r_tests/output/casting_test.yaka.output.c
diff --git a/...st_data/compiler_tests/class_stuff.tokens → .../compiler_tests/output/class_stuff.tokens b/...st_data/compiler_tests/class_stuff.tokens → .../compiler_tests/output/class_stuff.tokens
diff --git a/.../compiler_tests/class_stuff.yaka.output.c → ...er_tests/output/class_stuff.yaka.output.c b/.../compiler_tests/class_stuff.yaka.output.c → ...er_tests/output/class_stuff.yaka.output.c
diff --git a/...t_data/compiler_tests/defer_return.tokens → ...compiler_tests/output/defer_return.tokens b/...t_data/compiler_tests/defer_return.tokens → ...compiler_tests/output/defer_return.tokens
diff --git a/...compiler_tests/defer_return.yaka.output.c → ...r_tests/output/defer_return.yaka.output.c b/...compiler_tests/defer_return.yaka.output.c → ...r_tests/output/defer_return.yaka.output.c
diff --git a/...piler_tests/do_not_copy_str_getref.tokens → ...ests/output/do_not_copy_str_getref.tokens b/...piler_tests/do_not_copy_str_getref.tokens → ...ests/output/do_not_copy_str_getref.tokens
diff --git a/...ests/do_not_copy_str_getref.yaka.output.c → ...tput/do_not_copy_str_getref.yaka.output.c b/...ests/do_not_copy_str_getref.yaka.output.c → ...tput/do_not_copy_str_getref.yaka.output.c
diff --git a/...t_data/compiler_tests/eachelem_for.tokens → ...compiler_tests/output/eachelem_for.tokens b/...t_data/compiler_tests/eachelem_for.tokens → ...compiler_tests/output/eachelem_for.tokens
diff --git a/...compiler_tests/eachelem_for.yaka.output.c → ...r_tests/output/eachelem_for.yaka.output.c b/...compiler_tests/eachelem_for.yaka.output.c → ...r_tests/output/eachelem_for.yaka.output.c
diff --git a/...t_data/compiler_tests/elif_testing.tokens → ...compiler_tests/output/elif_testing.tokens b/...t_data/compiler_tests/elif_testing.tokens → ...compiler_tests/output/elif_testing.tokens
diff --git a/...compiler_tests/elif_testing.yaka.output.c → ...r_tests/output/elif_testing.yaka.output.c b/...compiler_tests/elif_testing.yaka.output.c → ...r_tests/output/elif_testing.yaka.output.c
diff --git a/...st_data/compiler_tests/endless_for.tokens → .../compiler_tests/output/endless_for.tokens b/...st_data/compiler_tests/endless_for.tokens → .../compiler_tests/output/endless_for.tokens
diff --git a/.../compiler_tests/endless_for.yaka.output.c → ...er_tests/output/endless_for.yaka.output.c b/.../compiler_tests/endless_for.yaka.output.c → ...er_tests/output/endless_for.yaka.output.c
diff --git a/...tion_datatype_passing_calling_test.tokens → ...tion_datatype_passing_calling_test.tokens b/...tion_datatype_passing_calling_test.tokens → ...tion_datatype_passing_calling_test.tokens
diff --git a/...tatype_passing_calling_test.yaka.output.c → ...tatype_passing_calling_test.yaka.output.c b/...tatype_passing_calling_test.yaka.output.c → ...tatype_passing_calling_test.yaka.output.c
diff --git a/...piler_tests/function_datatype_test.tokens → ...ests/output/function_datatype_test.tokens b/...piler_tests/function_datatype_test.tokens → ...ests/output/function_datatype_test.tokens
diff --git a/...ests/function_datatype_test.yaka.output.c → ...tput/function_datatype_test.yaka.output.c b/...ests/function_datatype_test.yaka.output.c → ...tput/function_datatype_test.yaka.output.c
diff --git a/...iler_tests/functional_test_countif.tokens → ...sts/output/functional_test_countif.tokens b/...iler_tests/functional_test_countif.tokens → ...sts/output/functional_test_countif.tokens
diff --git a/...sts/functional_test_countif.yaka.output.c → ...put/functional_test_countif.yaka.output.c b/...sts/functional_test_countif.yaka.output.c → ...put/functional_test_countif.yaka.output.c
diff --git a/...piler_tests/functional_test_filter.tokens → ...ests/output/functional_test_filter.tokens b/...piler_tests/functional_test_filter.tokens → ...ests/output/functional_test_filter.tokens
diff --git a/...ests/functional_test_filter.yaka.output.c → ...tput/functional_test_filter.yaka.output.c b/...ests/functional_test_filter.yaka.output.c → ...tput/functional_test_filter.yaka.output.c
diff --git a/...iler_tests/functional_test_foreach.tokens → ...sts/output/functional_test_foreach.tokens b/...iler_tests/functional_test_foreach.tokens → ...sts/output/functional_test_foreach.tokens
diff --git a/...sts/functional_test_foreach.yaka.output.c → ...put/functional_test_foreach.yaka.output.c b/...sts/functional_test_foreach.yaka.output.c → ...put/functional_test_foreach.yaka.output.c
diff --git a/...r_tests/functional_test_map.yaka.output.c → .../output/functional_test_map.yaka.output.c b/...r_tests/functional_test_map.yaka.output.c → .../output/functional_test_map.yaka.output.c
diff --git a/...ompiler_tests/functional_test_maph.tokens → ..._tests/output/functional_test_maph.tokens b/...ompiler_tests/functional_test_maph.tokens → ..._tests/output/functional_test_maph.tokens
diff --git a/...ta/compiler_tests/global_constants.tokens → ...iler_tests/output/global_constants.tokens b/...ta/compiler_tests/global_constants.tokens → ...iler_tests/output/global_constants.tokens
diff --git a/...iler_tests/global_constants.yaka.output.c → ...sts/output/global_constants.yaka.output.c b/...iler_tests/global_constants.yaka.output.c → ...sts/output/global_constants.yaka.output.c
diff --git a/.../test_data/compiler_tests/iif_test.tokens → ...ata/compiler_tests/output/iif_test.tokens b/.../test_data/compiler_tests/iif_test.tokens → ...ata/compiler_tests/output/iif_test.tokens
diff --git a/...ata/compiler_tests/iif_test.yaka.output.c → ...piler_tests/output/iif_test.yaka.output.c b/...ata/compiler_tests/iif_test.yaka.output.c → ...piler_tests/output/iif_test.yaka.output.c
diff --git a/...ata/compiler_tests/loops_and_logic.tokens → ...piler_tests/output/loops_and_logic.tokens b/...ata/compiler_tests/loops_and_logic.tokens → ...piler_tests/output/loops_and_logic.tokens
diff --git a/...piler_tests/loops_and_logic.yaka.output.c → ...ests/output/loops_and_logic.yaka.output.c b/...piler_tests/loops_and_logic.yaka.output.c → ...ests/output/loops_and_logic.yaka.output.c
diff --git a/...ta/compiler_tests/native_constants.tokens → ...iler_tests/output/native_constants.tokens b/...ta/compiler_tests/native_constants.tokens → ...iler_tests/output/native_constants.tokens
diff --git a/...iler_tests/native_constants.yaka.output.c → ...sts/output/native_constants.yaka.output.c b/...iler_tests/native_constants.yaka.output.c → ...sts/output/native_constants.yaka.output.c
diff --git a/...ta/compiler_tests/native_func_sort.tokens → ...iler_tests/output/native_func_sort.tokens b/...ta/compiler_tests/native_func_sort.tokens → ...iler_tests/output/native_func_sort.tokens
diff --git a/...iler_tests/native_func_sort.yaka.output.c → ...sts/output/native_func_sort.yaka.output.c b/...iler_tests/native_func_sort.yaka.output.c → ...sts/output/native_func_sort.yaka.output.c
diff --git a/...r_tests/native_function_type_tests.tokens → .../output/native_function_type_tests.tokens b/...r_tests/native_function_type_tests.tokens → .../output/native_function_type_tests.tokens
diff --git a/.../native_function_type_tests.yaka.output.c → .../native_function_type_tests.yaka.output.c b/.../native_function_type_tests.yaka.output.c → .../native_function_type_tests.yaka.output.c
diff --git a/...data/compiler_tests/nativefunc.ast.tokens → ...mpiler_tests/output/nativefunc.ast.tokens b/...data/compiler_tests/nativefunc.ast.tokens → ...mpiler_tests/output/nativefunc.ast.tokens
diff --git a/...est_data/compiler_tests/nativefunc.tokens → ...a/compiler_tests/output/nativefunc.tokens b/...est_data/compiler_tests/nativefunc.tokens → ...a/compiler_tests/output/nativefunc.tokens
diff --git a/...a/compiler_tests/nativefunc.yaka.output.c → ...ler_tests/output/nativefunc.yaka.output.c b/...a/compiler_tests/nativefunc.yaka.output.c → ...ler_tests/output/nativefunc.yaka.output.c
diff --git a/...ata/compiler_tests/none_comparison.tokens → ...piler_tests/output/none_comparison.tokens b/...ata/compiler_tests/none_comparison.tokens → ...piler_tests/output/none_comparison.tokens
diff --git a/...piler_tests/none_comparison.yaka.output.c → ...ests/output/none_comparison.yaka.output.c b/...piler_tests/none_comparison.yaka.output.c → ...ests/output/none_comparison.yaka.output.c
diff --git a/...ata/compiler_tests/normal_hash_map.tokens → ...piler_tests/output/normal_hash_map.tokens b/...ata/compiler_tests/normal_hash_map.tokens → ...piler_tests/output/normal_hash_map.tokens
diff --git a/...piler_tests/normal_hash_map.yaka.output.c → ...ests/output/normal_hash_map.yaka.output.c b/...piler_tests/normal_hash_map.yaka.output.c → ...ests/output/normal_hash_map.yaka.output.c
diff --git a/..._data/compiler_tests/on_stack_test.tokens → ...ompiler_tests/output/on_stack_test.tokens b/..._data/compiler_tests/on_stack_test.tokens → ...ompiler_tests/output/on_stack_test.tokens
diff --git a/...ompiler_tests/on_stack_test.yaka.output.c → ..._tests/output/on_stack_test.yaka.output.c b/...ompiler_tests/on_stack_test.yaka.output.c → ..._tests/output/on_stack_test.yaka.output.c
diff --git a/..._data/compiler_tests/operator_test.tokens → ...ompiler_tests/output/operator_test.tokens b/..._data/compiler_tests/operator_test.tokens → ...ompiler_tests/output/operator_test.tokens
diff --git a/...ompiler_tests/operator_test.yaka.output.c → ..._tests/output/operator_test.yaka.output.c b/...ompiler_tests/operator_test.yaka.output.c → ..._tests/output/operator_test.yaka.output.c
diff --git a/...t_data/compiler_tests/smallest.ast.tokens → ...compiler_tests/output/smallest.ast.tokens b/...t_data/compiler_tests/smallest.ast.tokens → ...compiler_tests/output/smallest.ast.tokens
diff --git a/...test_data/compiler_tests/sort_test.tokens → ...ta/compiler_tests/output/sort_test.tokens b/...test_data/compiler_tests/sort_test.tokens → ...ta/compiler_tests/output/sort_test.tokens
diff --git a/...ta/compiler_tests/sort_test.yaka.output.c → ...iler_tests/output/sort_test.yaka.output.c b/...ta/compiler_tests/sort_test.yaka.output.c → ...iler_tests/output/sort_test.yaka.output.c
diff --git a/...ta/compiler_tests/str_getref_unref.tokens → ...iler_tests/output/str_getref_unref.tokens b/...ta/compiler_tests/str_getref_unref.tokens → ...iler_tests/output/str_getref_unref.tokens
diff --git a/...iler_tests/str_getref_unref.yaka.output.c → ...sts/output/str_getref_unref.yaka.output.c b/...iler_tests/str_getref_unref.yaka.output.c → ...sts/output/str_getref_unref.yaka.output.c
diff --git a/...st_data/compiler_tests/string_hash.tokens → .../compiler_tests/output/string_hash.tokens b/...st_data/compiler_tests/string_hash.tokens → .../compiler_tests/output/string_hash.tokens
diff --git a/.../compiler_tests/string_hash.yaka.output.c → ...er_tests/output/string_hash.yaka.output.c b/.../compiler_tests/string_hash.yaka.output.c → ...er_tests/output/string_hash.yaka.output.c
diff --git a/...test_data/compiler_tests/test1.ast.tokens → ...ta/compiler_tests/output/test1.ast.tokens b/...test_data/compiler_tests/test1.ast.tokens → ...ta/compiler_tests/output/test1.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test1.tokens → ...t_data/compiler_tests/output/test1.tokens b/...ler/test_data/compiler_tests/test1.tokens → ...t_data/compiler_tests/output/test1.tokens
diff --git a/...t_data/compiler_tests/test1.yaka.output.c → ...compiler_tests/output/test1.yaka.output.c b/...t_data/compiler_tests/test1.yaka.output.c → ...compiler_tests/output/test1.yaka.output.c
diff --git a/...test_data/compiler_tests/test2.ast.tokens → ...ta/compiler_tests/output/test2.ast.tokens b/...test_data/compiler_tests/test2.ast.tokens → ...ta/compiler_tests/output/test2.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test2.tokens → ...t_data/compiler_tests/output/test2.tokens b/...ler/test_data/compiler_tests/test2.tokens → ...t_data/compiler_tests/output/test2.tokens
diff --git a/...t_data/compiler_tests/test2.yaka.output.c → ...compiler_tests/output/test2.yaka.output.c b/...t_data/compiler_tests/test2.yaka.output.c → ...compiler_tests/output/test2.yaka.output.c
diff --git a/...test_data/compiler_tests/test3.ast.tokens → ...ta/compiler_tests/output/test3.ast.tokens b/...test_data/compiler_tests/test3.ast.tokens → ...ta/compiler_tests/output/test3.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test3.tokens → ...t_data/compiler_tests/output/test3.tokens b/...ler/test_data/compiler_tests/test3.tokens → ...t_data/compiler_tests/output/test3.tokens
diff --git a/...t_data/compiler_tests/test3.yaka.output.c → ...compiler_tests/output/test3.yaka.output.c b/...t_data/compiler_tests/test3.yaka.output.c → ...compiler_tests/output/test3.yaka.output.c
diff --git a/...test_data/compiler_tests/test4.ast.tokens → ...ta/compiler_tests/output/test4.ast.tokens b/...test_data/compiler_tests/test4.ast.tokens → ...ta/compiler_tests/output/test4.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test4.tokens → ...t_data/compiler_tests/output/test4.tokens b/...ler/test_data/compiler_tests/test4.tokens → ...t_data/compiler_tests/output/test4.tokens
diff --git a/...t_data/compiler_tests/test4.yaka.output.c → ...compiler_tests/output/test4.yaka.output.c b/...t_data/compiler_tests/test4.yaka.output.c → ...compiler_tests/output/test4.yaka.output.c
diff --git a/...test_data/compiler_tests/test5.ast.tokens → ...ta/compiler_tests/output/test5.ast.tokens b/...test_data/compiler_tests/test5.ast.tokens → ...ta/compiler_tests/output/test5.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test5.tokens → ...t_data/compiler_tests/output/test5.tokens b/...ler/test_data/compiler_tests/test5.tokens → ...t_data/compiler_tests/output/test5.tokens
diff --git a/...t_data/compiler_tests/test5.yaka.output.c → ...compiler_tests/output/test5.yaka.output.c b/...t_data/compiler_tests/test5.yaka.output.c → ...compiler_tests/output/test5.yaka.output.c
diff --git a/...test_data/compiler_tests/test6.ast.tokens → ...ta/compiler_tests/output/test6.ast.tokens b/...test_data/compiler_tests/test6.ast.tokens → ...ta/compiler_tests/output/test6.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test6.tokens → ...t_data/compiler_tests/output/test6.tokens b/...ler/test_data/compiler_tests/test6.tokens → ...t_data/compiler_tests/output/test6.tokens
diff --git a/...t_data/compiler_tests/test6.yaka.output.c → ...compiler_tests/output/test6.yaka.output.c b/...t_data/compiler_tests/test6.yaka.output.c → ...compiler_tests/output/test6.yaka.output.c
diff --git a/...test_data/compiler_tests/test7.ast.tokens → ...ta/compiler_tests/output/test7.ast.tokens b/...test_data/compiler_tests/test7.ast.tokens → ...ta/compiler_tests/output/test7.ast.tokens
diff --git a/...ler/test_data/compiler_tests/test7.tokens → ...t_data/compiler_tests/output/test7.tokens b/...ler/test_data/compiler_tests/test7.tokens → ...t_data/compiler_tests/output/test7.tokens
diff --git a/...t_data/compiler_tests/test7.yaka.output.c → ...compiler_tests/output/test7.yaka.output.c b/...t_data/compiler_tests/test7.yaka.output.c → ...compiler_tests/output/test7.yaka.output.c
diff --git a/...est_data/compiler_tests/tuple_test.tokens → ...a/compiler_tests/output/tuple_test.tokens b/...est_data/compiler_tests/tuple_test.tokens → ...a/compiler_tests/output/tuple_test.tokens
diff --git a/...a/compiler_tests/tuple_test.yaka.output.c → ...ler_tests/output/tuple_test.yaka.output.c b/...a/compiler_tests/tuple_test.yaka.output.c → ...ler_tests/output/tuple_test.yaka.output.c
diff --git a/...t_data/compiler_tests/voidfunc.ast.tokens → ...compiler_tests/output/voidfunc.ast.tokens b/...t_data/compiler_tests/voidfunc.ast.tokens → ...compiler_tests/output/voidfunc.ast.tokens
diff --git a/.../test_data/compiler_tests/voidfunc.tokens → ...ata/compiler_tests/output/voidfunc.tokens b/.../test_data/compiler_tests/voidfunc.tokens → ...ata/compiler_tests/output/voidfunc.tokens
diff --git a/...ata/compiler_tests/voidfunc.yaka.output.c → ...piler_tests/output/voidfunc.yaka.output.c b/...ata/compiler_tests/voidfunc.yaka.output.c → ...piler_tests/output/voidfunc.yaka.output.c
diff --git a/compiler/tests/test_compiler.cpp b/compiler/tests/test_compiler.cpp
@@ -2,6 +2,7 @@
 #include "compiler/multifile_compiler.h"
 #include "file_formats/tokens_file.h"
 #include "tokenizer/tokenizer.h"
+#include <filesystem>
 #include <string>
 using namespace yaksha;
 #define TEST_FILE(A, B, C)                                                     \
@@ -13,8 +14,12 @@ using namespace yaksha;
     c_code.tokenize();                                                         \
     auto token_snapshot = yaksha::load_token_dump(C);                          \
     yaksha::save_token_dump(C, c_code.tokens_);                                \
-    std::string c_code_file{A};                                                \
-    c_code_file += ".output.c";                                                \
+    auto yaksha_file_path = std::filesystem::path{A};                          \
+    auto tokens_file_path = std::filesystem::path{C};                          \
+    std::string c_code_file =                                                  \
+        (tokens_file_path.parent_path() / yaksha_file_path.filename())         \
+            .string() +                                                        \
+        ".output.c";                                                           \
     std::ofstream save_file(c_code_file);                                      \
     REQUIRE(save_file.is_open() == true);                                      \
     save_file << result.code_;                                                 \
@@ -31,39 +36,39 @@ using namespace yaksha;
   } while (0)
 TEST_CASE("compiler: Hello World") {
   TEST_FILE("../test_data/compiler_tests/test1.yaka", "test1.yaka",
-            "../test_data/compiler_tests/test1.tokens");
+            "../test_data/compiler_tests/output/test1.tokens");
 }
 TEST_CASE("compiler: Defer") {
   TEST_FILE("../test_data/compiler_tests/test2.yaka", "test2.yaka",
-            "../test_data/compiler_tests/test2.tokens");
+            "../test_data/compiler_tests/output/test2.tokens");
 }
 TEST_CASE("compiler: Class support") {
   TEST_FILE("../test_data/compiler_tests/test3.yaka", "test3.yaka",
-            "../test_data/compiler_tests/test3.tokens");
+            "../test_data/compiler_tests/output/test3.tokens");
 }
 TEST_CASE("compiler: Create object from class") {
   TEST_FILE("../test_data/compiler_tests/test4.yaka", "test4.yaka",
-            "../test_data/compiler_tests/test4.tokens");
+            "../test_data/compiler_tests/output/test4.tokens");
 }
 TEST_CASE("compiler: Object members") {
   TEST_FILE("../test_data/compiler_tests/test5.yaka", "test5.yaka",
-            "../test_data/compiler_tests/test5.tokens");
+            "../test_data/compiler_tests/output/test5.tokens");
 }
 TEST_CASE("compiler: Array access") {
   TEST_FILE("../test_data/compiler_tests/test6.yaka", "test6.yaka",
-            "../test_data/compiler_tests/test6.tokens");
+            "../test_data/compiler_tests/output/test6.tokens");
 }
 TEST_CASE("compiler: Nested array access") {
   TEST_FILE("../test_data/compiler_tests/test7.yaka", "test7.yaka",
-            "../test_data/compiler_tests/test7.tokens");
+            "../test_data/compiler_tests/output/test7.tokens");
 }
 TEST_CASE("compiler: Void function") {
   TEST_FILE("../test_data/compiler_tests/voidfunc.yaka", "voidfunc.yaka",
-            "../test_data/compiler_tests/voidfunc.tokens");
+            "../test_data/compiler_tests/output/voidfunc.tokens");
 }
 TEST_CASE("compiler: Native functions") {
   TEST_FILE("../test_data/compiler_tests/nativefunc.yaka", "nativefunc.yaka",
-            "../test_data/compiler_tests/nativefunc.tokens");
+            "../test_data/compiler_tests/output/nativefunc.tokens");
 }
 TEST_CASE("compiler: Imports") {
   TEST_FILE("../test_data/import_tests/main.yaka", "main.yaka",
@@ -75,7 +80,7 @@ TEST_CASE("compiler: Native functions in imports") {
 }
 TEST_CASE("compiler: Array methods") {
   TEST_FILE("../test_data/compiler_tests/arrstack.yaka", "arrstack.yaka",
-            "../test_data/compiler_tests/arrstack.tokens");
+            "../test_data/compiler_tests/output/arrstack.tokens");
 }
 TEST_CASE("compiler: Native defines") {
   TEST_FILE("../test_data/byol/lisp.yaka", "lisp.yaka",
@@ -84,149 +89,158 @@ TEST_CASE("compiler: Native defines") {
 TEST_CASE("compiler: Do not copy str for getref") {
   TEST_FILE("../test_data/compiler_tests/do_not_copy_str_getref.yaka",
             "do_not_copy_str_getref.yaka",
-            "../test_data/compiler_tests/do_not_copy_str_getref.tokens");
+            "../test_data/compiler_tests/output/do_not_copy_str_getref.tokens");
 }
 TEST_CASE("compiler: Str unref and getref hacks!") {
   TEST_FILE("../test_data/compiler_tests/str_getref_unref.yaka",
             "str_getref_unref.yaka",
-            "../test_data/compiler_tests/str_getref_unref.tokens");
+            "../test_data/compiler_tests/output/str_getref_unref.tokens");
 }
 TEST_CASE("compiler: Test automatic generation for string hashes!") {
   TEST_FILE("../test_data/compiler_tests/string_hash.yaka", "string_hash.yaka",
-            "../test_data/compiler_tests/string_hash.tokens");
+            "../test_data/compiler_tests/output/string_hash.tokens");
 }
 TEST_CASE("compiler: Test return calls a function with defer deleted stuff !") {
   TEST_FILE("../test_data/compiler_tests/defer_return.yaka",
             "defer_return.yaka",
-            "../test_data/compiler_tests/defer_return.tokens");
+            "../test_data/compiler_tests/output/defer_return.tokens");
 }
 TEST_CASE("compiler: All @native stuff !") {
-  TEST_FILE("../test_data/compiler_tests/native_function_type_tests.yaka",
-            "native_function_type_tests.yaka",
-            "../test_data/compiler_tests/native_function_type_tests.tokens");
+  TEST_FILE(
+      "../test_data/compiler_tests/native_function_type_tests.yaka",
+      "native_function_type_tests.yaka",
+      "../test_data/compiler_tests/output/native_function_type_tests.tokens");
 }
 TEST_CASE("compiler: Test elif") {
   TEST_FILE("../test_data/compiler_tests/elif_testing.yaka",
             "elif_testing.yaka",
-            "../test_data/compiler_tests/elif_testing.tokens");
+            "../test_data/compiler_tests/output/elif_testing.tokens");
 }
 TEST_CASE("compiler: Casting") {
   TEST_FILE("../test_data/compiler_tests/casting_test.yaka",
             "casting_test.yaka",
-            "../test_data/compiler_tests/casting_test.tokens");
+            "../test_data/compiler_tests/output/casting_test.tokens");
 }
 TEST_CASE("compiler: Basic function pointer") {
   TEST_FILE("../test_data/compiler_tests/function_datatype_test.yaka",
             "function_datatype_test.yaka",
-            "../test_data/compiler_tests/function_datatype_test.tokens");
+            "../test_data/compiler_tests/output/function_datatype_test.tokens");
 }
 TEST_CASE("compiler: Function pointer passing & calling") {
   TEST_FILE(
       "../test_data/compiler_tests/function_datatype_passing_calling_test.yaka",
       "function_datatype_passing_calling_test.yaka",
-      "../test_data/compiler_tests/"
+      "../test_data/compiler_tests/output/"
       "function_datatype_passing_calling_test.tokens");
 }
 TEST_CASE("compiler: Test automatic generation for normal hashes!") {
   TEST_FILE("../test_data/compiler_tests/normal_hash_map.yaka",
             "normal_hash_map.yaka",
-            "../test_data/compiler_tests/normal_hash_map.tokens");
+            "../test_data/compiler_tests/output/normal_hash_map.tokens");
 }
 TEST_CASE("compiler: Test sorting functionality using qsort() !") {
   TEST_FILE("../test_data/compiler_tests/sort_test.yaka", "sort_test.yaka",
-            "../test_data/compiler_tests/sort_test.tokens");
+            "../test_data/compiler_tests/output/sort_test.tokens");
 }
 TEST_CASE("compiler: Test arrnew() !") {
   TEST_FILE("../test_data/compiler_tests/arrnew_test.yaka", "arrnew_test.yaka",
-            "../test_data/compiler_tests/arrnew_test.tokens");
+            "../test_data/compiler_tests/output/arrnew_test.tokens");
 }
 TEST_CASE("compiler: Test array() !") {
   TEST_FILE("../test_data/compiler_tests/array_test.yaka", "array_test.yaka",
-            "../test_data/compiler_tests/array_test.tokens");
+            "../test_data/compiler_tests/output/array_test.tokens");
 }
 TEST_CASE("compiler: Test sorting with @native functions") {
   TEST_FILE("../test_data/compiler_tests/native_func_sort.yaka",
             "native_func_sort.yaka",
-            "../test_data/compiler_tests/native_func_sort.tokens");
+            "../test_data/compiler_tests/output/native_func_sort.tokens");
 }
 TEST_CASE("compiler: Test iif() builtin") {
   TEST_FILE("../test_data/compiler_tests/iif_test.yaka", "iif_test.yaka",
-            "../test_data/compiler_tests/iif_test.tokens");
+            "../test_data/compiler_tests/output/iif_test.tokens");
 }
 TEST_CASE("compiler: Test foreach() builtin") {
-  TEST_FILE("../test_data/compiler_tests/functional_test_foreach.yaka",
-            "functional_test_foreach.yaka",
-            "../test_data/compiler_tests/functional_test_foreach.tokens");
+  TEST_FILE(
+      "../test_data/compiler_tests/functional_test_foreach.yaka",
+      "functional_test_foreach.yaka",
+      "../test_data/compiler_tests/output/functional_test_foreach.tokens");
 }
 TEST_CASE("compiler: Test countif() builtin") {
-  TEST_FILE("../test_data/compiler_tests/functional_test_countif.yaka",
-            "functional_test_countif.yaka",
-            "../test_data/compiler_tests/functional_test_countif.tokens");
+  TEST_FILE(
+      "../test_data/compiler_tests/functional_test_countif.yaka",
+      "functional_test_countif.yaka",
+      "../test_data/compiler_tests/output/functional_test_countif.tokens");
 }
 TEST_CASE("compiler: Test map() builtin") {
   TEST_FILE("../test_data/compiler_tests/functional_test_map.yaka",
             "functional_test_map.yaka",
-            "../test_data/compiler_tests/functional_test_maph.tokens");
+            "../test_data/compiler_tests/output/functional_test_maph.tokens");
 }
 TEST_CASE("compiler: Test filter() builtin") {
   TEST_FILE("../test_data/compiler_tests/functional_test_filter.yaka",
             "functional_test_filter.yaka",
-            "../test_data/compiler_tests/functional_test_filter.tokens");
+            "../test_data/compiler_tests/output/functional_test_filter.tokens");
 }
 TEST_CASE("compiler: Tuple data type") {
   TEST_FILE("../test_data/compiler_tests/tuple_test.yaka", "tuple_test.yaka",
-            "../test_data/compiler_tests/tuple_test.tokens");
+            "../test_data/compiler_tests/output/tuple_test.tokens");
 }
 TEST_CASE("compiler: Number literals") {
   TEST_FILE("../test_data/compiler_tests/all_integers.yaka",
             "all_integers.yaka",
-            "../test_data/compiler_tests/all_integers.tokens");
+            "../test_data/compiler_tests/output/all_integers.tokens");
 }
 TEST_CASE("compiler: Operator test augment assign and bitwise") {
   TEST_FILE("../test_data/compiler_tests/operator_test.yaka",
             "operator_test.yaka",
-            "../test_data/compiler_tests/operator_test.tokens");
+            "../test_data/compiler_tests/output/operator_test.tokens");
 }
 TEST_CASE("compiler: Global constants") {
   TEST_FILE("../test_data/compiler_tests/global_constants.yaka",
             "global_constants.yaka",
-            "../test_data/compiler_tests/global_constants.tokens");
+            "../test_data/compiler_tests/output/global_constants.tokens");
 }
 TEST_CASE("compiler: None comparison") {
   TEST_FILE("../test_data/compiler_tests/none_comparison.yaka",
             "none_comparison.yaka",
-            "../test_data/compiler_tests/none_comparison.tokens");
+            "../test_data/compiler_tests/output/none_comparison.tokens");
 }
 TEST_CASE("compiler: Loops and logical operators") {
   TEST_FILE("../test_data/compiler_tests/loops_and_logic.yaka",
             "loops_and_logic.yaka",
-            "../test_data/compiler_tests/loops_and_logic.tokens");
+            "../test_data/compiler_tests/output/loops_and_logic.tokens");
 }
 TEST_CASE("compiler: Class stuff") {
   TEST_FILE("../test_data/compiler_tests/class_stuff.yaka", "class_stuff.yaka",
-            "../test_data/compiler_tests/class_stuff.tokens");
+            "../test_data/compiler_tests/output/class_stuff.tokens");
 }
 TEST_CASE("compiler: Test binarydata() builtin") {
-  TEST_FILE("../test_data/compiler_tests/binarydata_builtin_test.yaka", "binarydata_builtin_test.yaka",
-            "../test_data/compiler_tests/binarydata_builtin_test.tokens");
+  TEST_FILE(
+      "../test_data/compiler_tests/binarydata_builtin_test.yaka",
+      "binarydata_builtin_test.yaka",
+      "../test_data/compiler_tests/output/binarydata_builtin_test.tokens");
 }
 TEST_CASE("compiler: Test native constants") {
-  TEST_FILE("../test_data/compiler_tests/native_constants.yaka", "native_constants.yaka",
-            "../test_data/compiler_tests/native_constants.tokens");
+  TEST_FILE("../test_data/compiler_tests/native_constants.yaka",
+            "native_constants.yaka",
+            "../test_data/compiler_tests/output/native_constants.tokens");
 }
 TEST_CASE("compiler: Test @onstack class") {
-  TEST_FILE("../test_data/compiler_tests/on_stack_test.yaka", "on_stack_test.yaka",
-            "../test_data/compiler_tests/on_stack_test.tokens");
+  TEST_FILE("../test_data/compiler_tests/on_stack_test.yaka",
+            "on_stack_test.yaka",
+            "../test_data/compiler_tests/output/on_stack_test.tokens");
 }
 TEST_CASE("compiler: Test endless for") {
   TEST_FILE("../test_data/compiler_tests/endless_for.yaka", "endless_for.yaka",
-            "../test_data/compiler_tests/endless_for.tokens");
+            "../test_data/compiler_tests/output/endless_for.tokens");
 }
 TEST_CASE("compiler: Test println each element in for") {
-  TEST_FILE("../test_data/compiler_tests/eachelem_for.yaka", "eachelem_for.yaka",
-            "../test_data/compiler_tests/eachelem_for.tokens");
+  TEST_FILE("../test_data/compiler_tests/eachelem_for.yaka",
+            "eachelem_for.yaka",
+            "../test_data/compiler_tests/output/eachelem_for.tokens");
 }
 TEST_CASE("compiler: bug-fix comment break indent") {
-  TEST_FILE("../test_data/bug_fixes/comment_break_indent.yaka", "comment_break_indent.yaka",
+  TEST_FILE("../test_data/bug_fixes/comment_break_indent.yaka",
+            "comment_break_indent.yaka",
             "../test_data/bug_fixes/comment_break_indent.tokens");
 }
diff --git a/compiler/tests/test_parser.cpp b/compiler/tests/test_parser.cpp
@@ -60,39 +60,39 @@ using namespace yaksha;
   } while (0)
 TEST_CASE("parser: Hello World") {
   TEST_FILE("../test_data/compiler_tests/test1.yaka", "test1.yaka",
-            "../test_data/compiler_tests/test1.ast.tokens");
+            "../test_data/compiler_tests/output/test1.ast.tokens");
 }
 TEST_CASE("parser: Defer") {
   TEST_FILE("../test_data/compiler_tests/test2.yaka", "test2.yaka",
-            "../test_data/compiler_tests/test2.ast.tokens");
+            "../test_data/compiler_tests/output/test2.ast.tokens");
 }
 TEST_CASE("parser: Class support") {
   TEST_FILE("../test_data/compiler_tests/test3.yaka", "test3.yaka",
-            "../test_data/compiler_tests/test3.ast.tokens");
+            "../test_data/compiler_tests/output/test3.ast.tokens");
 }
 TEST_CASE("parser: Create object from class") {
   TEST_FILE("../test_data/compiler_tests/test4.yaka", "test4.yaka",
-            "../test_data/compiler_tests/test4.ast.tokens");
+            "../test_data/compiler_tests/output/test4.ast.tokens");
 }
 TEST_CASE("parser: Object members") {
   TEST_FILE("../test_data/compiler_tests/test5.yaka", "test5.yaka",
-            "../test_data/compiler_tests/test5.ast.tokens");
+            "../test_data/compiler_tests/output/test5.ast.tokens");
 }
 TEST_CASE("parser: Array access") {
   TEST_FILE("../test_data/compiler_tests/test6.yaka", "test6.yaka",
-            "../test_data/compiler_tests/test6.ast.tokens");
+            "../test_data/compiler_tests/output/test6.ast.tokens");
 }
 TEST_CASE("parser: Nested array access") {
   TEST_FILE("../test_data/compiler_tests/test7.yaka", "test7.yaka",
-            "../test_data/compiler_tests/test7.ast.tokens");
+            "../test_data/compiler_tests/output/test7.ast.tokens");
 }
 TEST_CASE("parser: Void function") {
   TEST_FILE("../test_data/compiler_tests/voidfunc.yaka", "voidfunc.yaka",
-            "../test_data/compiler_tests/voidfunc.ast.tokens");
+            "../test_data/compiler_tests/output/voidfunc.ast.tokens");
 }
 TEST_CASE("parser: Native functions") {
   TEST_FILE("../test_data/compiler_tests/nativefunc.yaka", "nativefunc.yaka",
-            "../test_data/compiler_tests/nativefunc.ast.tokens");
+            "../test_data/compiler_tests/output/nativefunc.ast.tokens");
 }
 TEST_CASE("parser: Unicode test") {
   TEST_FILE("../test_data/unicode_test.py", "unicode_test.py",
@@ -142,5 +142,5 @@ TEST_CASE("parser: import in def") {
 }
 TEST_CASE("parser: mini blocks") {
   TEST_FILE("../test_data/compiler_tests/smallest.yaka", "smallest.yaka",
-            "../test_data/compiler_tests/smallest.ast.tokens");
-}
+            "../test_data/compiler_tests/output/smallest.ast.tokens");
+}