X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=CMakeLists.txt;h=561f4bf6e8a61b956c513851d103deaf0d3a3ac2;hb=5e7d3cb38951825b28a65cb88f0714db25368c67;hp=100076f595ffedcc2dc3e302d0a5a20ab6b3ac39;hpb=8ab120b87fc1ff4ac77d922cf786a044433f0de7;p=nothing.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 100076f5..561f4bf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,12 +16,11 @@ include_directories(src/)
 include_directories(${SDL2_INCLUDE_DIR})
 include_directories(${SDL2_MIXER_INCLUDE_DIR})
 
-set(SOURCE_FILES
+add_executable(nothing 
   src/color.c
   src/game.c
   src/game/camera.c
-  src/game/debug_tree.c
-  src/game/edit_field.c
+  src/ui/edit_field.c
   src/game/level.c
   src/game/level/background.c
   src/game/level/boxes.c
@@ -43,23 +42,26 @@ set(SOURCE_FILES
   src/math/rand.c
   src/math/rect.c
   src/math/triangle.c
-  src/script/expr.c
-  src/script/parser.c
-  src/script/tokenizer.c
+  src/ebisp/expr.c
+  src/ebisp/interpreter.c
+  src/ebisp/parser.c
+  src/ebisp/tokenizer.c
+  src/ebisp/gc.c
+  src/ebisp/scope.c
   src/sdl/renderer.c
   src/system/error.c
   src/system/lt.c
   src/system/lt/lt_adapters.c
   src/system/lt/lt_slot.c
-)
-
-set(HEADER_FILES
+  src/ui/console.c
+  src/ui/log.c
+  src/str.c
+  src/ui/history.c
+  src/game/level/regions.c
   src/color.h
   src/game.h
   src/game/camera.h
-  src/game/debug_node.h
-  src/game/debug_tree.h
-  src/game/edit_field.h
+  src/ui/edit_field.h
   src/game/level.h
   src/game/level/background.h
   src/game/level/boxes.h
@@ -81,38 +83,93 @@ set(HEADER_FILES
   src/math/rand.h
   src/math/rect.h
   src/math/triangle.h
-  src/script/expr.h
-  src/script/parser.h
-  src/script/tokenizer.h
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.h
+  src/ebisp/gc.h
+  src/ebisp/scope.h
+  src/ebisp/interpreter.h
+  src/ebisp/parser.h
+  src/ebisp/tokenizer.h
   src/sdl/renderer.h
   src/system/error.h
   src/system/lt.h
   src/system/lt/lt_adapters.h
   src/system/lt/lt_slot.h
+  src/ui/console.h
+  src/ui/log.h
+  src/str.h
+  src/ui/history.h
+  src/game/level/regions.h
+  src/system/line_stream.h
+  src/system/line_stream.c
+  src/game/level/script.h
+  src/game/level/script.c
+  src/system/log.h
+  src/system/log.c
+  src/system/nth_alloc.h
+  src/system/nth_alloc.c
 )
 
-add_executable(nothing ${SOURCE_FILES} ${HEADER_FILES})
-add_executable(nothing_test
-  src/script/expr.c
-  src/script/expr.h
-  src/script/parser.c
-  src/script/parser.h
-  src/script/tokenizer.c
-  src/script/tokenizer.h
+add_executable(repl
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.c
+  src/ebisp/expr.h
+  src/ebisp/interpreter.c
+  src/ebisp/interpreter.h
+  src/ebisp/parser.c
+  src/ebisp/parser.h
+  src/ebisp/scope.c
+  src/ebisp/scope.h
+  src/ebisp/tokenizer.c
+  src/ebisp/tokenizer.h
+  src/ebisp/repl.c
   src/system/lt.c
   src/system/lt.h
+  src/system/lt/lt_adapters.c
+  src/system/lt/lt_adapters.h
+  src/system/lt/lt_slot.c
+  src/system/lt/lt_slot.h
   src/system/error.c
   src/system/error.h
+  src/ebisp/gc.h
+  src/ebisp/gc.c
+  src/str.h
+  src/str.c
+  )
+add_executable(nothing_test
+  src/ebisp/builtins.c
+  src/ebisp/builtins.h
+  src/ebisp/expr.c
+  src/ebisp/expr.h
+  src/ebisp/interpreter.c
+  src/ebisp/interpreter.h
+  src/ebisp/parser.c
+  src/ebisp/parser.h
+  src/ebisp/scope.c
+  src/ebisp/scope.h
+  src/ebisp/tokenizer.c
+  src/ebisp/tokenizer.h
+  src/ebisp/gc.h
+  src/ebisp/gc.c
+  src/system/error.c
+  src/system/error.h
+  src/system/lt.c
+  src/system/lt.h
   src/system/lt/lt_adapters.c
   src/system/lt/lt_adapters.h
   src/system/lt/lt_slot.c
   src/system/lt/lt_slot.h
+  src/str.h
+  src/str.c
   test/main.c
   test/test.h
   test/tokenizer_suite.h
   )
 target_link_libraries(nothing ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
 target_link_libraries(nothing_test ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
+target_link_libraries(repl ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY})
 
 if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "CLANG"))
   set(CMAKE_C_FLAGS