diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea0374..65e8dfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ endif() # Options option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(BLAZE_BUILD_EXAMPLES "Build the Blaze example programs" ${BLAZE_STANDALONE}) +option(BLAZE_BUILD_TESTS "Build the Blaze test programs" ${BLAZE_STANDALONE}) # ------------------------------------------ @@ -55,18 +56,19 @@ endif() set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ------------------------------------------ -# Library +# Dependencies add_subdirectory("vendor/ruc") # ------------------------------------------ -# Application target +# Library target # Define source files -file(GLOB_RECURSE PROJECT_SOURCES "src/*.cpp") +file(GLOB_RECURSE LIBRARY_SOURCES "src/*.cpp") -add_executable(${PROJECT} ${PROJECT_SOURCES}) -target_include_directories(${PROJECT} PRIVATE "src") +add_library(${PROJECT} ${LIBRARY_SOURCES}) +target_include_directories(${PROJECT} PUBLIC + "src") target_link_libraries(${PROJECT} readline ruc) # ------------------------------------------ @@ -78,53 +80,55 @@ add_custom_target(${PROJECT}-lisp add_dependencies(${PROJECT} ${PROJECT}-lisp) # ------------------------------------------ -# Execute target +# Example target -add_custom_target(run - COMMAND ${PROJECT} -c - DEPENDS ${PROJECT}) +if (BLAZE_BUILD_EXAMPLES) + add_subdirectory("example") +endif() # ------------------------------------------ # Test targets -function(make_test_target target_name step_name) - add_custom_target(${target_name} - COMMAND ../vendor/mal/runtest.py --deferrable --optional ../tests/${step_name}.mal -- ./${PROJECT}) - add_dependencies(${target_name} ${PROJECT}) -endfunction() - -make_test_target("test0" "step0_repl") -make_test_target("test1" "step1_read_print") -make_test_target("test2" "step2_eval") -make_test_target("test3" "step3_env") -make_test_target("test4" "step4_if_fn_do") -make_test_target("test5" "step5_tco") -make_test_target("test6" "step6_file") -make_test_target("test7" "step7_quote") -make_test_target("test8" "step8_macros") -make_test_target("test9" "step9_try") -make_test_target("testA" "stepA_mal") - -function(make_host_test_target target_name step_name) - add_custom_target(${target_name} - COMMAND ../vendor/mal/runtest.py --deferrable --optional ../tests/${step_name}.mal -- ./${PROJECT} ../mal/${step_name}.mal) - add_dependencies(${target_name} ${PROJECT}) -endfunction() - -make_host_test_target("host_test0" "step0_repl") -make_host_test_target("host_test1" "step1_read_print") -make_host_test_target("host_test2" "step2_eval") -make_host_test_target("host_test3" "step3_env") -make_host_test_target("host_test4" "step4_if_fn_do") -# make_host_test_target("host_test5" "step5_tco") # disabled -make_host_test_target("host_test6" "step6_file") -make_host_test_target("host_test7" "step7_quote") -make_host_test_target("host_test8" "step8_macros") -make_host_test_target("host_test9" "step9_try") -make_host_test_target("host_testA" "stepA_mal") - -add_custom_target(perf - COMMAND ./${PROJECT} ../tests/perf1.mal - COMMAND ./${PROJECT} ../tests/perf2.mal - COMMAND ./${PROJECT} ../tests/perf3.mal) -add_dependencies(perf ${PROJECT}) +if (BLAZE_BUILD_TESTS) + function(make_test_target target_name step_name) + add_custom_target(${target_name} + COMMAND ../vendor/mal/runtest.py --deferrable --optional ../tests/${step_name}.mal -- ./${PROJECT}) + add_dependencies(${target_name} ${PROJECT}) + endfunction() + + make_test_target("test0" "step0_repl") + make_test_target("test1" "step1_read_print") + make_test_target("test2" "step2_eval") + make_test_target("test3" "step3_env") + make_test_target("test4" "step4_if_fn_do") + make_test_target("test5" "step5_tco") + make_test_target("test6" "step6_file") + make_test_target("test7" "step7_quote") + make_test_target("test8" "step8_macros") + make_test_target("test9" "step9_try") + make_test_target("testA" "stepA_mal") + + function(make_host_test_target target_name step_name) + add_custom_target(${target_name} + COMMAND ../vendor/mal/runtest.py --deferrable --optional ../tests/${step_name}.mal -- ./${PROJECT} ../mal/${step_name}.mal) + add_dependencies(${target_name} ${PROJECT}) + endfunction() + + make_host_test_target("host_test0" "step0_repl") + make_host_test_target("host_test1" "step1_read_print") + make_host_test_target("host_test2" "step2_eval") + make_host_test_target("host_test3" "step3_env") + make_host_test_target("host_test4" "step4_if_fn_do") + # make_host_test_target("host_test5" "step5_tco") # disabled + make_host_test_target("host_test6" "step6_file") + make_host_test_target("host_test7" "step7_quote") + make_host_test_target("host_test8" "step8_macros") + make_host_test_target("host_test9" "step9_try") + make_host_test_target("host_testA" "stepA_mal") + + add_custom_target(perf + COMMAND ./${PROJECT} ../tests/perf1.mal + COMMAND ./${PROJECT} ../tests/perf2.mal + COMMAND ./${PROJECT} ../tests/perf3.mal) + add_dependencies(perf ${PROJECT}) +endif() diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt new file mode 100644 index 0000000..8414202 --- /dev/null +++ b/example/CMakeLists.txt @@ -0,0 +1,25 @@ +# ------------------------------------------ +# User config between these lines + +# Set project name +set(EXAMPLE "repl") + +# ------------------------------------------ + +project(${EXAMPLE} CXX) + +# Define game source files +file(GLOB_RECURSE EXAMPLE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + +add_executable(${EXAMPLE} ${EXAMPLE_SOURCES}) +target_include_directories(${EXAMPLE} PRIVATE + "src") +target_link_libraries(${EXAMPLE} ${PROJECT}) + +# ------------------------------------------ + +# Add 'make run' target +add_custom_target(run + COMMAND ${EXAMPLE} -c + DEPENDS ${PROJECT} + WORKING_DIRECTORY "..") diff --git a/src/main.cpp b/example/src/main.cpp similarity index 93% rename from src/main.cpp rename to example/src/main.cpp index b08bc39..a6f29ff 100644 --- a/src/main.cpp +++ b/example/src/main.cpp @@ -13,11 +13,11 @@ #include "ruc/format/color.h" #include "ruc/format/print.h" -#include "ast.h" -#include "env/environment.h" -#include "forward.h" -#include "repl.h" -#include "settings.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/forward.h" +#include "blaze/repl.h" +#include "blaze/settings.h" namespace blaze { diff --git a/src/ast.cpp b/src/blaze/ast.cpp similarity index 97% rename from src/ast.cpp rename to src/blaze/ast.cpp index 28db938..c470bc9 100644 --- a/src/ast.cpp +++ b/src/blaze/ast.cpp @@ -10,12 +10,12 @@ #include // std::move #include -#include "ast.h" -#include "env/environment.h" -#include "error.h" -#include "forward.h" -#include "printer.h" -#include "types.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/error.h" +#include "blaze/forward.h" +#include "blaze/printer.h" +#include "blaze/types.h" namespace blaze { diff --git a/src/ast.h b/src/blaze/ast.h similarity index 99% rename from src/ast.h rename to src/blaze/ast.h index f861896..e462640 100644 --- a/src/ast.h +++ b/src/blaze/ast.h @@ -20,7 +20,7 @@ #include "ruc/format/formatter.h" -#include "forward.h" +#include "blaze/forward.h" namespace blaze { diff --git a/src/env/environment.cpp b/src/blaze/env/environment.cpp similarity index 96% rename from src/env/environment.cpp rename to src/blaze/env/environment.cpp index eb46d91..e88b6b6 100644 --- a/src/env/environment.cpp +++ b/src/blaze/env/environment.cpp @@ -11,11 +11,11 @@ #include "ruc/file.h" #include "ruc/format/format.h" -#include "ast.h" -#include "env/environment.h" -#include "error.h" -#include "forward.h" -#include "repl.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/error.h" +#include "blaze/forward.h" +#include "blaze/repl.h" namespace blaze { diff --git a/src/env/environment.h b/src/blaze/env/environment.h similarity index 97% rename from src/env/environment.h rename to src/blaze/env/environment.h index b24058a..4bcda6d 100644 --- a/src/env/environment.h +++ b/src/blaze/env/environment.h @@ -11,8 +11,8 @@ #include #include -#include "ast.h" -#include "forward.h" +#include "blaze/ast.h" +#include "blaze/forward.h" namespace blaze { diff --git a/src/env/functions/collection-access.cpp b/src/blaze/env/functions/collection-access.cpp similarity index 97% rename from src/env/functions/collection-access.cpp rename to src/blaze/env/functions/collection-access.cpp index a2c97bb..ab85617 100644 --- a/src/env/functions/collection-access.cpp +++ b/src/blaze/env/functions/collection-access.cpp @@ -7,10 +7,10 @@ #include // size_t #include // std:static_pointer_cast -#include "ast.h" -#include "env/macro.h" -#include "forward.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/forward.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/collection-constructor.cpp b/src/blaze/env/functions/collection-constructor.cpp similarity index 96% rename from src/env/functions/collection-constructor.cpp rename to src/blaze/env/functions/collection-constructor.cpp index b729c08..4bfb0b0 100644 --- a/src/env/functions/collection-constructor.cpp +++ b/src/blaze/env/functions/collection-constructor.cpp @@ -7,10 +7,10 @@ #include // size_t #include // std:static_pointer_cast -#include "ast.h" -#include "env/macro.h" -#include "forward.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/forward.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/collection-modify.cpp b/src/blaze/env/functions/collection-modify.cpp similarity index 97% rename from src/env/functions/collection-modify.cpp rename to src/blaze/env/functions/collection-modify.cpp index 54bc098..042c305 100644 --- a/src/env/functions/collection-modify.cpp +++ b/src/blaze/env/functions/collection-modify.cpp @@ -8,12 +8,12 @@ #include // size_t #include // std::static_pointer_cast -#include "ast.h" -#include "env/environment.h" -#include "env/macro.h" -#include "forward.h" -#include "repl.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/env/macro.h" +#include "blaze/forward.h" +#include "blaze/repl.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/compare.cpp b/src/blaze/env/functions/compare.cpp similarity index 98% rename from src/env/functions/compare.cpp rename to src/blaze/env/functions/compare.cpp index 5a87563..c49a00d 100644 --- a/src/env/functions/compare.cpp +++ b/src/blaze/env/functions/compare.cpp @@ -8,9 +8,9 @@ #include // std::function #include // std::static_pointer_cast -#include "ast.h" -#include "env/macro.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/convert.cpp b/src/blaze/env/functions/convert.cpp similarity index 98% rename from src/env/functions/convert.cpp rename to src/blaze/env/functions/convert.cpp index 0d9939e..1da0c3d 100644 --- a/src/env/functions/convert.cpp +++ b/src/blaze/env/functions/convert.cpp @@ -8,9 +8,9 @@ #include #include // std::errc -#include "ast.h" -#include "env/macro.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/format.cpp b/src/blaze/env/functions/format.cpp similarity index 95% rename from src/env/functions/format.cpp rename to src/blaze/env/functions/format.cpp index 4c2add8..559a8ab 100644 --- a/src/env/functions/format.cpp +++ b/src/blaze/env/functions/format.cpp @@ -7,13 +7,13 @@ #include // std::next #include -#include "reader.h" #include "ruc/format/print.h" -#include "ast.h" -#include "env/macro.h" -#include "printer.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/printer.h" +#include "blaze/reader.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/meta.cpp b/src/blaze/env/functions/meta.cpp similarity index 90% rename from src/env/functions/meta.cpp rename to src/blaze/env/functions/meta.cpp index b9bb686..b45c3ff 100644 --- a/src/env/functions/meta.cpp +++ b/src/blaze/env/functions/meta.cpp @@ -4,11 +4,11 @@ * SPDX-License-Identifier: MIT */ -#include "ast.h" -#include "env/macro.h" -#include "error.h" -#include "forward.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/error.h" +#include "blaze/forward.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/mutable.cpp b/src/blaze/env/functions/mutable.cpp similarity index 91% rename from src/env/functions/mutable.cpp rename to src/blaze/env/functions/mutable.cpp index 9e1c11c..0b1fb96 100644 --- a/src/env/functions/mutable.cpp +++ b/src/blaze/env/functions/mutable.cpp @@ -7,12 +7,12 @@ #include // std::copy #include // std::static_pointer_cast -#include "ast.h" -#include "env/environment.h" -#include "env/macro.h" -#include "forward.h" -#include "repl.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/env/macro.h" +#include "blaze/forward.h" +#include "blaze/repl.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/operators.cpp b/src/blaze/env/functions/operators.cpp similarity index 98% rename from src/env/functions/operators.cpp rename to src/blaze/env/functions/operators.cpp index 86f5e8e..43ea0ce 100644 --- a/src/env/functions/operators.cpp +++ b/src/blaze/env/functions/operators.cpp @@ -7,9 +7,9 @@ #include // int64_t #include // std::static_pointer_cast -#include "ast.h" -#include "env/macro.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/other.cpp b/src/blaze/env/functions/other.cpp similarity index 85% rename from src/env/functions/other.cpp rename to src/blaze/env/functions/other.cpp index 9db73ad..7e99d11 100644 --- a/src/env/functions/other.cpp +++ b/src/blaze/env/functions/other.cpp @@ -7,11 +7,11 @@ #include // std::chrono::sytem_clock #include // int64_t -#include "ast.h" -#include "env/macro.h" -#include "error.h" -#include "forward.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/error.h" +#include "blaze/forward.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/predicate.cpp b/src/blaze/env/functions/predicate.cpp similarity index 97% rename from src/env/functions/predicate.cpp rename to src/blaze/env/functions/predicate.cpp index 522be78..e6ab000 100644 --- a/src/env/functions/predicate.cpp +++ b/src/blaze/env/functions/predicate.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: MIT */ -#include "ast.h" -#include "env/macro.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/functions/repl.cpp b/src/blaze/env/functions/repl.cpp similarity index 91% rename from src/env/functions/repl.cpp rename to src/blaze/env/functions/repl.cpp index 469bd24..36dd6c4 100644 --- a/src/env/functions/repl.cpp +++ b/src/blaze/env/functions/repl.cpp @@ -8,10 +8,10 @@ #include "ruc/file.h" -#include "ast.h" -#include "env/macro.h" -#include "repl.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/macro.h" +#include "blaze/repl.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/env/macro.h b/src/blaze/env/macro.h similarity index 91% rename from src/env/macro.h rename to src/blaze/env/macro.h index e3af93d..e5dcbc4 100644 --- a/src/env/macro.h +++ b/src/blaze/env/macro.h @@ -4,9 +4,11 @@ * SPDX-License-Identifier: MIT */ +#pragma once + #include -#include "env/environment.h" +#include "blaze/env/environment.h" #define ADD_FUNCTION(name, signature, documentation, lambda) \ Environment::registerFunction( \ diff --git a/src/error.h b/src/blaze/error.h similarity index 95% rename from src/error.h rename to src/blaze/error.h index 4fd857e..9e10ea3 100644 --- a/src/error.h +++ b/src/blaze/error.h @@ -10,8 +10,8 @@ #include "ruc/singleton.h" -#include "forward.h" -#include "lexer.h" +#include "blaze/forward.h" +#include "blaze/lexer.h" namespace blaze { diff --git a/src/eval-special-form.cpp b/src/blaze/eval-special-form.cpp similarity index 98% rename from src/eval-special-form.cpp rename to src/blaze/eval-special-form.cpp index 2d33735..fc5e9b3 100644 --- a/src/eval-special-form.cpp +++ b/src/blaze/eval-special-form.cpp @@ -16,16 +16,16 @@ #include "ruc/format/format.h" #include "ruc/format/print.h" -#include "ast.h" -#include "env/environment.h" -#include "error.h" -#include "eval.h" -#include "forward.h" -#include "macro.h" -#include "printer.h" -#include "settings.h" -#include "types.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/error.h" +#include "blaze/eval.h" +#include "blaze/forward.h" +#include "blaze/macro.h" +#include "blaze/printer.h" +#include "blaze/settings.h" +#include "blaze/types.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/eval.cpp b/src/blaze/eval.cpp similarity index 96% rename from src/eval.cpp rename to src/blaze/eval.cpp index 2b67690..8fc7025 100644 --- a/src/eval.cpp +++ b/src/blaze/eval.cpp @@ -10,13 +10,13 @@ #include // std::span #include -#include "ast.h" -#include "env/environment.h" -#include "error.h" -#include "eval.h" -#include "forward.h" -#include "types.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/env/environment.h" +#include "blaze/error.h" +#include "blaze/eval.h" +#include "blaze/forward.h" +#include "blaze/types.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/eval.h b/src/blaze/eval.h similarity index 97% rename from src/eval.h rename to src/blaze/eval.h index cedde0d..0f85574 100644 --- a/src/eval.h +++ b/src/blaze/eval.h @@ -8,7 +8,7 @@ #include -#include "forward.h" // EnvironmentPtr +#include "blaze/forward.h" // EnvironmentPtr namespace blaze { diff --git a/src/forward.h b/src/blaze/forward.h similarity index 100% rename from src/forward.h rename to src/blaze/forward.h diff --git a/src/lexer.cpp b/src/blaze/lexer.cpp similarity index 98% rename from src/lexer.cpp rename to src/blaze/lexer.cpp index 3bf73fd..29151ee 100644 --- a/src/lexer.cpp +++ b/src/blaze/lexer.cpp @@ -11,8 +11,8 @@ #include "ruc/format/print.h" #include "ruc/genericlexer.h" -#include "error.h" -#include "lexer.h" +#include "blaze/error.h" +#include "blaze/lexer.h" namespace blaze { diff --git a/src/lexer.h b/src/blaze/lexer.h similarity index 100% rename from src/lexer.h rename to src/blaze/lexer.h diff --git a/src/macro.h b/src/blaze/macro.h similarity index 95% rename from src/macro.h rename to src/blaze/macro.h index 98ada68..aa6d842 100644 --- a/src/macro.h +++ b/src/blaze/macro.h @@ -4,7 +4,9 @@ * SPDX-License-Identifier: MIT */ -#include "eval.h" +#pragma once + +#include "blaze/eval.h" #define CONCAT(a, b) CONCAT_IMPL(a, b) #define CONCAT_IMPL(a, b) a##b diff --git a/src/printer.cpp b/src/blaze/printer.cpp similarity index 96% rename from src/printer.cpp rename to src/blaze/printer.cpp index e37c597..fedd22a 100644 --- a/src/printer.cpp +++ b/src/blaze/printer.cpp @@ -11,13 +11,13 @@ #include "ruc/format/color.h" #include "ruc/format/format.h" -#include "ast.h" -#include "error.h" -#include "lexer.h" -#include "printer.h" -#include "settings.h" -#include "types.h" -#include "util.h" +#include "blaze/ast.h" +#include "blaze/error.h" +#include "blaze/lexer.h" +#include "blaze/printer.h" +#include "blaze/settings.h" +#include "blaze/types.h" +#include "blaze/util.h" namespace blaze { diff --git a/src/printer.h b/src/blaze/printer.h similarity index 96% rename from src/printer.h rename to src/blaze/printer.h index f99686a..4116b10 100644 --- a/src/printer.h +++ b/src/blaze/printer.h @@ -6,9 +6,10 @@ #pragma once -#include "ast.h" #include +#include "blaze/ast.h" + namespace blaze { // Serializer -> return to string diff --git a/src/reader.cpp b/src/blaze/reader.cpp similarity index 98% rename from src/reader.cpp rename to src/blaze/reader.cpp index caf465f..10da190 100644 --- a/src/reader.cpp +++ b/src/blaze/reader.cpp @@ -12,14 +12,14 @@ #include // std::errc #include // std::move -#include "error.h" #include "ruc/format/color.h" #include "ruc/meta/assert.h" -#include "ast.h" -#include "reader.h" -#include "settings.h" -#include "types.h" +#include "blaze/ast.h" +#include "blaze/error.h" +#include "blaze/reader.h" +#include "blaze/settings.h" +#include "blaze/types.h" namespace blaze { diff --git a/src/reader.h b/src/blaze/reader.h similarity index 96% rename from src/reader.h rename to src/blaze/reader.h index 26b01eb..7592d5b 100644 --- a/src/reader.h +++ b/src/blaze/reader.h @@ -10,8 +10,8 @@ #include // std::shared_ptr #include -#include "ast.h" -#include "lexer.h" +#include "blaze/ast.h" +#include "blaze/lexer.h" #define INDENTATION_WIDTH 2 diff --git a/src/readline.cpp b/src/blaze/readline.cpp similarity index 97% rename from src/readline.cpp rename to src/blaze/readline.cpp index 86f4407..06d809d 100644 --- a/src/readline.cpp +++ b/src/blaze/readline.cpp @@ -15,7 +15,7 @@ #include "ruc/format/color.h" #include "ruc/format/print.h" -#include "readline.h" +#include "blaze/readline.h" namespace blaze { diff --git a/src/readline.h b/src/blaze/readline.h similarity index 100% rename from src/readline.h rename to src/blaze/readline.h diff --git a/src/repl.cpp b/src/blaze/repl.cpp similarity index 86% rename from src/repl.cpp rename to src/blaze/repl.cpp index 7a2c260..4df86dc 100644 --- a/src/repl.cpp +++ b/src/blaze/repl.cpp @@ -11,16 +11,16 @@ #include "ruc/format/print.h" -#include "env/environment.h" -#include "error.h" -#include "eval.h" -#include "forward.h" -#include "lexer.h" -#include "printer.h" -#include "reader.h" -#include "readline.h" -#include "repl.h" -#include "settings.h" +#include "blaze/env/environment.h" +#include "blaze/error.h" +#include "blaze/eval.h" +#include "blaze/forward.h" +#include "blaze/lexer.h" +#include "blaze/printer.h" +#include "blaze/reader.h" +#include "blaze/readline.h" +#include "blaze/repl.h" +#include "blaze/settings.h" namespace blaze { diff --git a/src/repl.h b/src/blaze/repl.h similarity index 92% rename from src/repl.h rename to src/blaze/repl.h index 6fba5e2..9a8081f 100644 --- a/src/repl.h +++ b/src/blaze/repl.h @@ -10,8 +10,8 @@ #include #include -#include "forward.h" -#include "readline.h" +#include "blaze/forward.h" +#include "blaze/readline.h" namespace blaze { diff --git a/src/settings.cpp b/src/blaze/settings.cpp similarity index 83% rename from src/settings.cpp rename to src/blaze/settings.cpp index 9f346fe..405eca5 100644 --- a/src/settings.cpp +++ b/src/blaze/settings.cpp @@ -8,10 +8,10 @@ #include "ruc/meta/assert.h" -#include "env/environment.h" -#include "forward.h" -#include "settings.h" -#include "types.h" +#include "blaze/env/environment.h" +#include "blaze/forward.h" +#include "blaze/settings.h" +#include "blaze/types.h" namespace blaze { diff --git a/src/settings.h b/src/blaze/settings.h similarity index 100% rename from src/settings.h rename to src/blaze/settings.h diff --git a/src/types.h b/src/blaze/types.h similarity index 100% rename from src/types.h rename to src/blaze/types.h diff --git a/src/util.h b/src/blaze/util.h similarity index 99% rename from src/util.h rename to src/blaze/util.h index 588d239..a63584a 100644 --- a/src/util.h +++ b/src/blaze/util.h @@ -10,8 +10,8 @@ #include #include -#include "error.h" -#include "types.h" +#include "blaze/error.h" +#include "blaze/types.h" // -----------------------------------------