diff --git a/Cargo.lock b/Cargo.lock index da1ed9d..410f5e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,243 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "anstream" +version = "0.6.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "zern" version = "0.1.0" +dependencies = [ + "clap", +] diff --git a/Cargo.toml b/Cargo.toml index dc7f217..190f328 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,3 +4,4 @@ version = "0.1.0" edition = "2024" [dependencies] +clap = { version = "4.5.40", features = ["derive"] } diff --git a/src/codegen_x86_64.rs b/src/codegen_x86_64.rs index d0e9865..6849cd0 100644 --- a/src/codegen_x86_64.rs +++ b/src/codegen_x86_64.rs @@ -282,6 +282,13 @@ Array.free: var_type, initializer, } => { + if env.get_var(&name.lexeme).is_some() { + return error!( + name.loc, + format!("variable already defined: {}", &name.lexeme) + ); + } + self.compile_expr(env, initializer)?; let offset = env.define_var(name.lexeme.clone(), var_type.lexeme); emit!(&mut self.output, " mov QWORD [rbp-{}], rax", offset); @@ -387,6 +394,7 @@ Array.free: let begin_label = self.label(); let end_label = self.label(); + env.push_scope(); let offset = env.define_var(var.lexeme, "I64".into()); self.compile_expr(env, start)?; @@ -404,6 +412,7 @@ Array.free: emit!(&mut self.output, " mov QWORD [rbp-{}], rax", offset); emit!(&mut self.output, " jmp {}", begin_label); emit!(&mut self.output, "{}:", end_label); + env.pop_scope(); } } Ok(()) diff --git a/src/main.rs b/src/main.rs index 4cfc9f5..65e3359 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,13 +3,15 @@ mod parser; mod tokenizer; use std::{ - env, fs, + fs, path::Path, process::{self, Command}, }; use tokenizer::ZernError; +use clap::Parser; + fn compile_file_to( codegen: &mut codegen_x86_64::CodegenX86_64, filename: &str, @@ -27,71 +29,82 @@ fn compile_file_to( Ok(()) } -fn compile_file(path: String) -> Result<(), ZernError> { - let source = match fs::read_to_string(path.clone()) { +fn compile_file(args: Args) -> Result<(), ZernError> { + let source = match fs::read_to_string(&args.path) { Ok(x) => x, Err(_) => { - eprintln!("\x1b[91mERROR\x1b[0m: failed to open {}", path); + eprintln!("\x1b[91mERROR\x1b[0m: failed to open {}", args.path); process::exit(1); } }; - let filename = Path::new(&path).file_name().unwrap().to_str().unwrap(); + let filename = Path::new(&args.path).file_name().unwrap().to_str().unwrap(); let mut codegen = codegen_x86_64::CodegenX86_64::new(); codegen.emit_prologue()?; compile_file_to(&mut codegen, "std.zr", include_str!("std.zr").into())?; compile_file_to(&mut codegen, filename, source)?; - // TODO - if fs::write("out.s", codegen.get_output()).is_err() { - eprintln!("\x1b[91mERROR\x1b[0m: failed to write to out.s"); - process::exit(1); - } + if !args.output_asm { + if fs::write(format!("{}.s", args.out), codegen.get_output()).is_err() { + eprintln!("\x1b[91mERROR\x1b[0m: failed to write to {}.s", args.out); + process::exit(1); + } - if !Command::new("nasm") - .args(["-f", "elf64", "-o", "out.o", "out.s"]) - .status() - .unwrap() - .success() - { - process::exit(1); - } + if !Command::new("sh") + .args([ + "-c", + &format!("nasm -f elf64 -o {}.o {}.s", args.out, args.out), + ]) + .status() + .unwrap() + .success() + { + process::exit(1); + } - // TODO: drop libc entirely - if !Command::new("./musl-1.2.4/root/bin/musl-gcc") - .args([ - "-static", - "-o", - "out", - "out.o", - "-flto", - "-Os", - "-Wl,--gc-sections", - ]) - .status() - .unwrap() - .success() - { + // TODO: drop libc entirely + if !Command::new("sh") + .args([ + "-c", + &format!( + "./musl-1.2.4/root/bin/musl-gcc -static -o {} {}.o -flto -Wl,--gc-sections {}", + args.out, args.out, args.cflags + ), + ]) + .status() + .unwrap() + .success() + { + process::exit(1); + } + } else if fs::write(&args.out, codegen.get_output()).is_err() { + eprintln!("\x1b[91mERROR\x1b[0m: failed to write to {}", args.out); process::exit(1); } Ok(()) } +#[derive(Parser, Debug)] +#[command(version, about, long_about = None)] +struct Args { + path: String, + + #[arg(short, default_value = "out", help = "Output path")] + out: String, + + #[arg(short = 'S', help = "Only generate assembly")] + output_asm: bool, + + #[arg(short = 'C', default_value = "", help = "Extra flags to pass to gcc")] + cflags: String, +} + fn main() { - let mut args = env::args(); - let _ = args.next(); + let args = Args::parse(); - let path = match args.next() { - Some(x) => x, - None => { - eprintln!("\x1b[91mERROR\x1b[0m: expected an argument"); - process::exit(1); - } - }; - - if let Err(err) = compile_file(path) { + if let Err(err) = compile_file(args) { eprintln!("{}", err); process::exit(1); }