compiler.cpp build fix, fixes

byterun/include/sm_parser.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <optional>
 #include <string>
 #include <variant>
 #include <vector>

byterun/regression_check.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-xmake build
+# xmake build
-cp "build/linux/x86_64/release/byterun" byterun.exe
+# cp "build/linux/x86_64/release/byterun" byterun.exe
 
-# dune build > /dev/null
+dune build > /dev/null
 
 prefix="../regression/"
 suffix=".lama"

byterun/src/compiler.cpp

@@ -1,6 +1,8 @@
 // based on src/X86_64.ml
 
+extern "C" {
 #include "../../runtime/runtime.h"
+}
 
 #include "compiler.hpp"
 #include "sm_parser.hpp"
@@ -1955,7 +1957,7 @@ std::vector<Instr> compile(const Options &cmd, Env &env,
                            std::vector<std::string>{imports},
                            [](const auto &i) { return i != "Std"; }),
                        [](const auto &i) -> Instr {
-                         return Call{std::format("init" + i)};
+                         return Call{std::format("init {}", i)};
                 }) : std::vector<Instr>{}),
                 std::move(check_argc_code)
               );

byterun/src/sm_parser_old.cpp

@@ -1 +0,0 @@
-

byterun/xmake.lua

@@ -5,9 +5,9 @@ set_languages("c++23", "c23")
 
 target("byterun")
     set_kind("binary")
-    add_includedirs("include")
+    add_includedirs("include", "../runtime")
     add_files("../runtime/**.c", "../runtime/**.S")
-    add_files("src/**.cpp", "src/**.c")
+    add_files( "src/**.cpp", "src/**.c")
     set_warnings("allextra")
     set_rundir("$(projectdir)")
     add_defines("WITH_CHECK")