directly emit code

Author: KANIN KEARPIMY

spy/backend/c/cbackend.py

@@ -190,30 +190,6 @@ def cwrite(self) -> None:
                 print(f"---- {c_mod.cfile} ----")
                 print(highlight_src("C", c_mod.cfile.read()))  # type: ignore
 
-        argv_cfile = self._maybe_write_argv_helper()
-        if argv_cfile is not None:
-            self.cfiles.append(argv_cfile)
-
-    def _maybe_write_argv_helper(self) -> Optional[py.path.local]:
-        from spy.fqn import FQN
-
-        fqn_main = FQN([self.main_modname, "main"])
-        if fqn_main not in self.vm.globals_w:
-            return None
-        w_main = self.vm.globals_w[fqn_main]
-        if not isinstance(w_main, W_ASTFunc):
-            return None
-        if len(w_main.w_functype.params) != 1:
-            return None
-
-        # spy_wrap_argv depends on the generated _list.c and _list.h for the
-        # list[str] layout, so it can't be precompiled into libspy. Instead we
-        # copy list.c into the build directory and prepend the generated header.
-        list_c = spy.libspy.SRC.join("list.c")
-        cfile = self.build_dir.join("src", "list.c")
-        cfile.write_binary(b'#include "spy_structdefs.h"\n' + list_c.read_binary())
-        return cfile
-
     def write_build_script(self) -> None:
         assert self.cfiles != [], "call .cwrite() first"
         wasm_exports = []

spy/backend/c/cmodwriter.py

@@ -161,7 +161,24 @@ def init_c(self) -> None:
             returns_i32 = w_main.w_functype.w_restype == B.w_i32
 
             if needs_argv:
-                self.tbh_includes.wl('#include "spy/list.h"')
+                self.tbh.wb("""
+                    #define spy_list_str spy__list$list__builtins$str$_ListImpl
+                    #define spy_list_str_new spy__list$list__builtins$str$_ListImpl$__new__
+                    #define spy_list_str_push spy__list$list__builtins$str$_ListImpl$_push
+
+                    spy_list_str
+                    spy_wrap_argv(int argc, const char *argv[]) {
+                        spy_list_str lst = spy_list_str_new();
+                        for (int i = 0; i < argc; i++) {
+                            size_t size_str = strlen(argv[i]);
+                            spy_Str *allo = spy_str_alloc(size_str);
+                            char *buf = (char *)allo->utf8;
+                            memcpy(buf, argv[i], size_str);
+                            lst = spy_list_str_push(lst, allo);
+                        }
+                        return lst;
+                    }
+                """)
 
             if needs_argv and returns_i32:
                 execution_code = f"""

spy/tests/test_cli.py

@@ -293,7 +293,6 @@ def main(argv: list[str]) -> None:
         hsrc = main_h.read()
         assert "spy_wrap_argv" in csrc
         assert "int main(int argc" in csrc
-        assert "spy/list.h" in hsrc
 
     def test_argv_with_exit_code_cwrite(self):
         src = """
@@ -310,7 +309,6 @@ def main(argv: list[str]) -> i32:
         hsrc = main_h.read()
         assert "spy_wrap_argv" in csrc
         assert "int main(int argc" in csrc
-        assert "spy/list.h" in hsrc
 
     def test_no_argv_no_wrap_cwrite(self):
         src = """