lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: finalize updated standalone runtime system

Browse source
This commit is contained in:
Erica Marigold 2023-11-22 15:41:19 +05:30
parent dc2bab3f10
commit 441a1eacfe
No known key found for this signature in database
GPG key ID: 2768CC0C23D245D1
2 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cli/build.rs
View file

@ -13,9 +13,7 @@ pub async fn build_standalone<T: AsRef<Path> + Into<PathBuf>>(
) -> Result<()> {
// First, we read the contents of the lune interpreter as our starting point
let mut patched_bin = fs::read(env::current_exe()?).await?;
let base_bin_offset = u64::try_from(patched_bin.len() - 1)?;
println!("base offset: {}", base_bin_offset);
let base_bin_offset = u64::try_from(patched_bin.len())?;
// The signature which separates indicates the presence of bytecode to execute
// If a binary contains this signature, that must mean it is a standalone binar

30
src/cli/mod.rs
View file

@ -182,35 +182,25 @@ impl Cli {
}
if bytecode_offset != 0 && bytecode_size != 0 {
Lune::new()
let result = Lune::new()
.with_args(self.script_args.clone())
.run(
"STANDALONE",
&bin[usize::try_from(bytecode_offset).unwrap()
..usize::try_from(bytecode_offset + bytecode_size).unwrap()],
)
.await?;
.await;
return Ok(match result {
Err(err) => {
eprintln!("{err}");
ExitCode::FAILURE
}
Ok(code) => code,
});
}
return repl::show_interface().await;
// Check to see if the lune executable includes the signature
// return match bin
// .clone()
// .par_windows(signature.len())
// // .rev()
// .position_any(|block| block == signature)
// {
// // If we find the signature, all bytes after the 5 signature bytes must be bytecode
// Some(offset) => {
// // let offset = bin.len() - 1 - back_offset;
// }
// // If we did not generate any typedefs, know we're not a precompiled bin and
// // we know that the user did not provide any other options, and in that
// // case we should enter the REPL
// None => repl::show_interface().await,
// };
}
// Figure out if we should read from stdin or from a file,
// reading from stdin is marked by passing a single "-"