Use random rs output name. (#334)

* Use random rs output name.

Signed-off-by: Tricster <[email protected]>

* Test/rs: Change melody to serde_json.

Signed-off-by: Tricster <[email protected]>

* Ports/py: export load_from_package.

Signed-off-by: Tricster <[email protected]>

Signed-off-by: Tricster <[email protected]>

Author: MediosZ

source/loaders/rs_loader/rust/compiler/Cargo.toml

@@ -11,4 +11,5 @@ dlopen = "0.1.8"
 libffi = "3.0.0"
 cargo_toml = "0.11.5"
 lazy_static = "1.4.0"
-itertools = "0.10.3"
+itertools = "0.10.3"
+fastrand = "1.4"

source/loaders/rs_loader/rust/compiler/src/lib.rs

@@ -509,6 +509,19 @@ impl CompilerCallbacks {
     }
 }
 
+fn generate_random_string(length: usize) -> String {
+    let charset_str = "abcdefghijklmnopqrstuvwxyz";
+    let chars: Vec<char> = charset_str.chars().collect();
+    let mut result = String::with_capacity(length);
+
+    unsafe {
+        for _ in 0..length {
+            result.push(*chars.get_unchecked(fastrand::usize(0..chars.len())));
+        }
+    }
+    result
+}
+
 impl rustc_driver::Callbacks for CompilerCallbacks {
     fn config(&mut self, config: &mut Config) {
         if matches!(self.source.source, Source::Package { .. }) {
@@ -573,8 +586,26 @@ impl rustc_driver::Callbacks for CompilerCallbacks {
             config.input_path = Some(self.source.input_path.clone());
         }
         // Set up output
-        config.output_file = Some(self.source.output.clone());
-
+        if self.is_parsing {
+            let random_string = generate_random_string(5);
+            let mut output_path = self.source.output.clone();
+            let new_filename = format!(
+                "{}_{}",
+                output_path
+                    .file_prefix()
+                    .expect("Unable to get file prefix")
+                    .to_string_lossy(),
+                random_string
+            );
+            output_path.set_file_name(new_filename);
+            if let Some(ext) = self.source.output.extension() {
+                output_path.set_extension(ext);
+            }
+            config.output_file = Some(output_path.clone());
+            self.source.output = output_path;
+        } else {
+            config.output_file = Some(self.source.output.clone());
+        }
         // Setting up default compiler flags
         config.opts.output_types = config::OutputTypes::new(&[(config::OutputType::Exe, None)]);
         config.opts.optimize = config::OptLevel::Default;

source/loaders/rs_loader/rust/compiler/src/wrapper/mod.rs

@@ -129,7 +129,7 @@ fn generate_class_wrapper_for_package(classes: &Vec<&crate::Class>) -> String {
 }
 pub fn generate_wrapper(callbacks: CompilerCallbacks) -> std::io::Result<CompilerCallbacks> {
     match callbacks.source.source {
-        Source::Package { path } => {
+        Source::Package { ref path } => {
             let mut content = String::new();
             let function_wrapper = generate_function_wrapper_for_package(&callbacks.functions);
             content.push_str(&function_wrapper);
@@ -152,9 +152,13 @@ pub fn generate_wrapper(callbacks: CompilerCallbacks) -> std::io::Result<Compile
             wrapper_file.write_all(b"mod metacall_class;\nuse metacall_class::*;\n")?;
             wrapper_file.write_all(content.as_bytes())?;
 
+            let mut source = Source::new(Source::Package {
+                path: path.to_path_buf(),
+            });
+            source.output = callbacks.source.output;
             // construct new callback
             Ok(CompilerCallbacks {
-                source: Source::new(Source::Package { path: path }),
+                source,
                 is_parsing: false,
                 ..callbacks
             })
@@ -190,10 +194,11 @@ pub fn generate_wrapper(callbacks: CompilerCallbacks) -> std::io::Result<Compile
                     wrapper_file.write_all(content.as_bytes())?;
                     let dst = format!("include!({:?});", callbacks.source.input_path.clone());
                     wrapper_file.write_all(dst.as_bytes())?;
-
+                    let mut source = Source::new(Source::File { path: source_path });
+                    source.output = callbacks.source.output;
                     // construct new callback
                     Ok(CompilerCallbacks {
-                        source: Source::new(Source::File { path: source_path }),
+                        source,
                         is_parsing: false,
                         ..callbacks
                     })
@@ -217,12 +222,13 @@ pub fn generate_wrapper(callbacks: CompilerCallbacks) -> std::io::Result<Compile
                         wrapper_file.write_all(content.as_bytes())?;
                         let dst = format!("include!({:?});", source_path.join("script.rs"));
                         wrapper_file.write_all(dst.as_bytes())?;
-
+                        let mut source = Source::new(Source::File {
+                            path: source_path.join("wrapped_script.rs"),
+                        });
+                        source.output = callbacks.source.output;
                         // construct new callback
                         Ok(CompilerCallbacks {
-                            source: Source::new(Source::File {
-                                path: source_path.join("wrapped_script.rs"),
-                            }),
+                            source,
                             is_parsing: false,
                             ..callbacks
                         })

source/ports/py_port/metacall/__init__.py

@@ -17,4 +17,4 @@
 #	See the License for the specific language governing permissions and
 #	limitations under the License.
 
-from metacall.api import metacall, metacall_load_from_file, metacall_load_from_memory, metacall_inspect
+from metacall.api import metacall, metacall_load_from_file, metacall_load_from_memory, metacall_load_from_package, metacall_inspect

source/scripts/rust/basic/source/basic.rs

@@ -18,7 +18,7 @@ pub fn add_float(num_1: f32, num_2: f32) -> f32 {
 pub fn run() {
     let dir = env::temp_dir();
     let mut f = File::create(dir.join("hello.txt")).unwrap();
-    f.write(b"Hello metacall");
+    let _ = f.write(b"Hello metacall");
 }
 
 // pub fn add_vec(vec: &mut Vec<i32>) -> i32 {

source/scripts/rust/melody/Cargo.lock

@@ -1,7 +1,9 @@
 [package]
-name = "melody"
+name = "json-wrapper"
 version = "0.1.0"
 edition = "2021"
 
+crate-type=["lib"]
+
 [dependencies]
-melody_compiler = "0.18.1"
+serde_json = "1.0"

source/scripts/rust/melody/Cargo.toml

@@ -1,7 +1,6 @@
-use melody_compiler::compiler;
+use serde_json::Value;
 
 pub fn compile(s: String) -> String {
-    let ret = compiler(&s).unwrap_or_else(|x| format!("Compiler error {:?}", x));
-    dbg!(&ret);
-    ret
+    let v: Value = serde_json::from_str(&s).unwrap();
+    v["name"].to_string()
 }

source/scripts/rust/melody/src/lib.rs

@@ -1,5 +1,5 @@
 # Check if loaders are enabled
-if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_LOADERS_RB OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_PORTS OR NOT OPTION_BUILD_PORTS_PY OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_PY OR NOT OPTION_BUILD_SCRIPTS_RB OR NOT OPTION_BUILD_SCRIPTS_NODE)
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_PY OR NOT OPTION_BUILD_LOADERS_RB OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_LOADERS_RS OR NOT OPTION_BUILD_PORTS OR NOT OPTION_BUILD_PORTS_PY OR NOT OPTION_BUILD_SCRIPTS OR NOT OPTION_BUILD_SCRIPTS_PY OR NOT OPTION_BUILD_SCRIPTS_RB OR NOT OPTION_BUILD_SCRIPTS_RS OR NOT OPTION_BUILD_SCRIPTS_NODE)
 	return()
 endif()