sage
/
rush
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marginally better path and expression handling.

This commit is contained in:
Sage Vaillancourt 2021-08-22 11:20:38 -04:00
parent 17c4aba9c0
commit 36ba81e4c4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@ -63,7 +63,8 @@ fn needs_compilation(script_name: &str) -> bool {
true true
} }
fn output_filename(script_name: &str) -> String { fn output_filename(script_name: &str) -> String {
format!(".{}.compiled", script_name.replace("./", "")) let (dir, base_filename) = script_name.rsplit_once("/").unwrap();
format!("{}/.{}.compiled", dir, base_filename)
} }
fn run_compiled(script_name: &str) { fn run_compiled(script_name: &str) {
@ -88,7 +89,7 @@ fn parse_bash_command(
} }
code.push_str("\")"); code.push_str("\")");
let peek = iter.peek(); let peek = iter.peek();
if peek.is_none() || peek.contains(&&' ') || peek.contains(&&'\n') { if !is_expr && (peek.is_none() || peek.contains(&&' ') || peek.contains(&&'\n')) {
code.push(';'); code.push(';');
} }
Ok(()) Ok(())
@ -138,6 +139,12 @@ fn main() {
if (c == 'i' && iter.peek().contains(&&'f')) if (c == 'i' && iter.peek().contains(&&'f'))
|| (c == '=' && !iter.peek().contains(&&'=')) { || (c == '=' && !iter.peek().contains(&&'=')) {
is_expr = true; is_expr = true;
} else if c == 'f' && iter.peek().contains(&&'o') {
iter.next();
code.push('o');
if iter.peek().contains(&&'r') {
is_expr = true;
}
} else if (c == '{' || c == ';') && is_expr { } else if (c == '{' || c == ';') && is_expr {
is_expr = false; is_expr = false;
} else if c == '\n' && iter.peek().is_some() { } else if c == '\n' && iter.peek().is_some() {
@ -156,9 +163,11 @@ fn main() -> Result<()> {
run_compiled(&script_name); run_compiled(&script_name);
return Ok(()); return Ok(());
} }
let script_base_filename = script_name.split("/").last().unwrap();
let code = collect_code(&script_name)?; let code = collect_code(&script_name)?;
let code_filename = format!("/tmp/{}-rush.rs", let code_filename = format!("/tmp/{}-rush.rs",
script_name.replace("./", "").replace(".", "-")); script_base_filename.replace(".", "-"));
let mut file = File::create(&code_filename)?; let mut file = File::create(&code_filename)?;
file.write_all(code.as_bytes())?; file.write_all(code.as_bytes())?;