basic compiler integration (with errors, without check)

byterun/dune

@@ -6,12 +6,14 @@
   (:parser src/parser.cpp)
   (:analyzer src/analyzer.cpp)
   (:module_manager src/module_manager.cpp)
+  (:sm_parser src/sm_parser.cpp)
+  (:compiler src/compiler.cpp)
   (:obj types.o interpreter.o)
   (:runtime ../runtime/runtime.a))
  (mode
   (promote (until-clean)))
  (action
-  (run g++ -Wall -Wextra -O3 -std=c++20 -DWITH_CHECK -Iinclude/ %{main} %{parser} %{analyzer} %{module_manager} %{runtime} %{obj} -o %{target})))
+  (run g++ -Wall -Wextra -O3 -std=c++20 -DWITH_CHECK -Iinclude/ %{main} %{parser} %{analyzer} %{module_manager} %{sm_parser} %{compiler} %{runtime} %{obj} -o %{target})))
 
 (rule
  (target types.o)

byterun/include/compiler.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "sm_parser.hpp"
+#include <vector>
+
+std::vector<std::string> compile_to_code(const std::vector<SMInstr> &code);

byterun/src/cli.cpp

@@ -2,6 +2,7 @@
 #include <iostream>
 
 #include "analyzer.hpp"
+#include "compiler.hpp"
 #include "parser.hpp"
 #include "sm_parser.hpp"
 
@@ -24,7 +25,7 @@ int main(int argc, char **argv) {
   bool do_print = false;
   if (strcmp(argv[1], "-i") == 0) {
     do_interpretation = true;
-  } else if (strcmp(argv[1], "-sm") == 0) { // TODO: TMP, FOR CHECKS
+  } else if (strcmp(argv[1], "-ds") == 0) { // TODO: TMP, FOR CHECKS
     std::ifstream file(argv[2]);
     std::cout << "-- parse\n";
     auto instrs = parse_sm(file);
@@ -33,6 +34,13 @@ int main(int argc, char **argv) {
       std::cout << print_sm(instr) << "\n";
     }
     return 0;
+  } else if (strcmp(argv[1], "-s") == 0) {
+    std::ifstream file(argv[2]);
+    auto instrs = compile_to_code(parse_sm(file));
+    for (auto &instr : instrs) {
+      std::cout << instr << "\n";
+    }
+    return 0;
   }
 #ifdef WITH_CHECK
   else if (strcmp(argv[1], "-vi") == 0) {

byterun/src/compiler.cpp

@@ -2,6 +2,7 @@
 
 #include "../../runtime/runtime.h"
 
+#include "compiler.hpp"
 #include "sm_parser.hpp"
 
 #include <format>
@@ -2115,3 +2116,15 @@ std::vector<Instr> compile(const Options &cmd, Env &env,
   }
   return result;
 }
+
+std::vector<std::string> compile_to_code(const std::vector<SMInstr> &code) {
+  Options cmd{.topname = "byterun", .filename = "byterun"}; // TODO TMP
+  Env env(Mode{.is_debug = true, .target_os = OS::LINUX});
+
+  auto asm_code = compile(cmd, env, {/*imports (TODO TMP)*/}, code);
+  std::vector<std::string> res;
+  std::transform(asm_code.begin(), asm_code.end(), std::back_inserter(res),
+                 [&env](const auto &instr) { return to_code(env, instr); });
+
+  return res;
+}

byterun/xmake.lua

@@ -8,7 +8,6 @@ target("byterun")
     add_includedirs("include")
     add_files("../runtime/**.c", "../runtime/**.S")
     add_files("src/**.cpp", "src/**.c")
-    remove_files("src/compiler.cpp")
     set_warnings("allextra")
     set_rundir("$(projectdir)")
     add_defines("WITH_CHECK")