fix: library std code generation

sigmasoldi3r · Dec 26, 2023 · 786e595 · 786e595
1 parent 64f7376
commit 786e595
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/janus/src/compilation/mod.rs b/janus/src/compilation/mod.rs
@@ -77,15 +77,19 @@ impl CompilationHost {
             .arg("-o")
             .arg(&out);
         // If not the main file, skip the STD header injection
-        match &info.main {
-            PathBufOrPathBufList::PathBuf(main) => {
-                if main != file_path {
-                    cmd.arg("--no-std");
+        if info.no_std || info.mode == CompilationMode::Lib {
+            cmd.arg("--no-std");
+        } else {
+            match &info.main {
+                PathBufOrPathBufList::PathBuf(main) => {
+                    if main != file_path {
+                        cmd.arg("--no-std");
+                    }
                 }
-            }
-            PathBufOrPathBufList::PathBufList(mains) => {
-                if !mains.contains(file_path) {
-                    cmd.arg("--no-std");
+                PathBufOrPathBufList::PathBufList(mains) => {
+                    if !mains.contains(file_path) {
+                        cmd.arg("--no-std");
+                    }
                 }
             }
         }

diff --git a/src/lua/helpers.rs b/src/lua/helpers.rs
@@ -1,8 +1,8 @@
 /// Generates the given source as a virtual module, used by Lua target.
 pub fn generate_module_chunk(name: &String, source: &String) -> String {
-    let tmp = format!("_G[\"__saturnus_module_{name}\"]");
+    let tmp = format!("__saturnus_module_{name}");
     format!(
-        "{tmp} = function()
+        "local {tmp} = function()
   {source}
 end;
 if jit then