Merge pull request #22 from mjp41/0-cooking-lasagna

Restructuring and more files
fxpl · Oct 8, 2024 · 5cdc978 · 5cdc978
2 parents 7ec863f + 1c58f26
commit 5cdc978
Show file tree

Hide file tree

Showing 28 changed files with 2,388 additions and 2,319 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,9 +26,18 @@ set (TRIESTE_ENABLE_TESTING OFF)
 FetchContent_MakeAvailable_ExcludeFromAll(trieste)
 set(CMAKE_CXX_STANDARD 20)
 
-add_library(rt OBJECT src/rt/rt.cc)
-
-add_library(lang OBJECT src/lang/lang.cc src/lang/interpreter.cc)
+add_library(rt OBJECT src/rt/rt.cc src/rt/ui/mermaid.cc)
+
+add_library(
+  lang OBJECT
+  src/lang/lang.cc
+  src/lang/interpreter.cc
+  src/lang/passes/parse.cc
+  src/lang/passes/grouping.cc
+  src/lang/passes/call_stmts.cc
+  src/lang/passes/flatten.cc
+  src/lang/passes/bytecode.cc
+)
 target_link_libraries(lang PRIVATE trieste::trieste)
 
 add_executable(verona_dyn src/main.cc)

diff --git a/src/api.h b/src/api.h
diff --git a/src/lang/bytecode.h b/src/lang/bytecode.h
@@ -37,4 +37,3 @@ inline const trieste::TokenDef Jump{"jump", trieste::flag::print};
 inline const trieste::TokenDef JumpFalse{"jump_false", trieste::flag::print};
 inline const trieste::TokenDef Print("print", trieste::flag::print);
 inline const trieste::TokenDef IterNext("iter_next");
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,3 @@ inline const trieste::TokenDef Jump{"jump", trieste::flag::print};
		inline const trieste::TokenDef JumpFalse{"jump_false", trieste::flag::print};
		inline const trieste::TokenDef Print("print", trieste::flag::print);
		inline const trieste::TokenDef IterNext("iter_next");