diff --git a/Cargo.lock b/Cargo.lock index 97ce953..d0155c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,243 +2,6 @@ # 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.3.0" -dependencies = [ - "clap", -] diff --git a/Cargo.toml b/Cargo.toml index 42989fe..1c8b388 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,3 @@ name = "zern" version = "0.3.0" edition = "2024" license = "BSD-2-Clause" - -[dependencies] -clap = { version = "4.5.40", features = ["derive"] } diff --git a/examples/chip8.zr b/examples/chip8.zr index 795755a..e1c1dc4 100644 --- a/examples/chip8.zr +++ b/examples/chip8.zr @@ -15,8 +15,8 @@ struct CHIP8 sp: i64 reg: ptr I: i64 - delay_timer: i64 - sound_timer: i64 + delay_timer: u8 + sound_timer: u8 keyboard: Array display: ptr keyboard_map: Array @@ -49,8 +49,8 @@ func chip8_disassemble[c: CHIP8, ins_count: i64] : void for i in 0..ins_count io.printf("0x%x: ", c->pc) - let high: i64 = c->memory[c->pc] - let low: i64 = c->memory[c->pc + 1] + let high: i64 = c->memory[c->pc] as i64 + let low: i64 = c->memory[c->pc + 1] as i64 c->pc = c->pc + 2 let ins: i64 = (high << 8) | low @@ -145,8 +145,8 @@ func chip8_disassemble[c: CHIP8, ins_count: i64] : void io.printf("??? (%x)\n", ins) func chip8_step[c: CHIP8] : void - let high: i64 = c->memory[c->pc] - let low: i64 = c->memory[c->pc + 1] + let high: i64 = c->memory[c->pc] as i64 + let low: i64 = c->memory[c->pc + 1] as i64 c->pc = c->pc + 2 let ins: i64 = (high << 8) | low @@ -192,17 +192,17 @@ func chip8_step[c: CHIP8] : void else if n == 0x3 c->reg[x] = c->reg[x] ^ c->reg[y] else if n == 0x4 - let res: i64 = c->reg[x] + c->reg[y] - c->reg[0xf] = res > 0xff + let res: u8 = c->reg[x] + c->reg[y] + c->reg[0xf] = (res > 0xff) as u8 c->reg[x] = res else if n == 0x5 - c->reg[0xf] = c->reg[x] > c->reg[y] + c->reg[0xf] = (c->reg[x] > c->reg[y]) as u8 c->reg[x] = c->reg[x] - c->reg[y] else if n == 0x6 c->reg[0xf] = c->reg[x] & 0x1 c->reg[x] = c->reg[x] >> 1 else if n == 0x7 - c->reg[0xf] = c->reg[y] > c->reg[x] + c->reg[0xf] = (c->reg[y] > c->reg[x]) as u8 c->reg[x] = c->reg[y] - c->reg[x] else if n == 0xE c->reg[0xf] = (c->reg[x] & 0x80) >> 7 @@ -221,19 +221,19 @@ func chip8_step[c: CHIP8] : void for row in 0..n for col in 0..8 if (c->memory[c->I + row] & (0x80 >> col)) != 0 - let pixel_x: i64 = (c->reg[x] + col) % 64 - let pixel_y: i64 = (c->reg[y] + row) % 32 - let offset: i64 = pixel_x + (pixel_y * 64) + let pixel_x: u8 = (c->reg[x] + col) % 64 + let pixel_y: u8 = (c->reg[y] + row) % 32 + let offset: i64 = pixel_x as i64 + (pixel_y * 64) if c->display[offset] == 1 c->reg[0xf] = 1 c->display[offset] = c->display[offset] ^ 1 else if op == 0xe if kk == 0x9e - if IsKeyDown(array.nth(c->keyboard_map, c->reg[x])) + if IsKeyDown(array.nth(c->keyboard_map, c->reg[x] as i64)) c->pc = c->pc + 2 else if kk == 0xa1 - if !IsKeyDown(array.nth(c->keyboard_map, c->reg[x])) + if !IsKeyDown(array.nth(c->keyboard_map, c->reg[x] as i64)) c->pc = c->pc + 2 else if op == 0xf if kk == 0x07 @@ -252,7 +252,7 @@ func chip8_step[c: CHIP8] : void else if kk == 0x1E c->I = c->I + c->reg[x] else if kk == 0x29 - c->I = c->reg[x] * 5 + c->I = c->reg[x] as i64 * 5 else if kk == 0x33 c->memory[c->I] = c->reg[x] / 100 c->memory[c->I + 1] = (c->reg[x] / 10) % 10 @@ -274,17 +274,17 @@ func chip8_free[c: CHIP8] : void mem.free(c) func main[argc: i64, argv: ptr] : i64 - let path: str = 0 - let disassemble: bool = 0 + let path: str = 0 as str + let disassemble: bool = false for i in 1..argc - let arg: str = mem.read64(argv + i * 8) + let arg: str = mem.read64(argv + i * 8) as str if str.equal(arg, "-d") - disassemble = 1 + disassemble = true else path = arg - if path == 0 + if path as i64 == 0 io.println("Usage: chip8 -d ") return 1 diff --git a/src/main.rs b/src/main.rs index 69c7743..107bc3b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,8 +12,6 @@ use std::{ use tokenizer::ZernError; -use clap::Parser; - macro_rules! parse_std_file { ($statements:expr, $filename:expr) => { let source: String = include_str!($filename).into(); @@ -109,29 +107,71 @@ fn run_command(cmd: String) { } } -#[derive(Parser, Debug)] -#[command(version, about, long_about = None)] struct Args { path: String, - - #[arg(short, help = "Output path")] out: Option, - - #[arg(short = 'S', help = "Only generate assembly")] output_asm: bool, - - #[arg(short = 'r', help = "Run the compiled executable")] run_exe: bool, - - #[arg(short = 'm', help = "Use gcc")] use_gcc: bool, - - #[arg(short = 'C', default_value = "", help = "Extra flags to pass to gcc")] cflags: String, } +impl Args { + fn parse(mut args: std::env::Args) -> Args { + let mut out = Args { + path: String::new(), + out: None, + output_asm: false, + run_exe: false, + use_gcc: false, + cflags: String::new(), + }; + + while let Some(arg) = args.next() { + if arg == "-o" { + match args.next() { + Some(s) => out.out = Some(s), + None => { + eprintln!("-o option requires a name"); + process::exit(1); + } + } + } else if arg == "-S" { + out.output_asm = true; + } else if arg == "-r" { + out.run_exe = true; + } else if arg == "-m" { + out.use_gcc = true; + } else if arg == "-C" { + match args.next() { + Some(s) => out.cflags = s, + None => { + eprintln!("-C option requires a name"); + process::exit(1); + } + } + } else if arg == "-h" || arg == "--help" { + println!("Usage: zern [-o path] [-S] [-r] [-m] [-C cflags] path"); + process::exit(0); + } else if arg.starts_with('-') { + eprintln!("unrecognized option: {}", arg); + process::exit(1); + } else if out.path.is_empty() { + out.path = arg + } else { + eprintln!("unrecognized argument: {}", arg); + process::exit(1); + } + } + + out + } +} + fn main() { - let args = Args::parse(); + let mut raw_args = std::env::args(); + _ = raw_args.next(); + let args = Args::parse(raw_args); if !args.use_gcc && !args.cflags.is_empty() { eprintln!("You can't set CFLAGS if you're not using gcc. Add the -m flag."); diff --git a/src/typechecker.rs b/src/typechecker.rs index b7cfe7e..11d6983 100644 --- a/src/typechecker.rs +++ b/src/typechecker.rs @@ -12,7 +12,7 @@ macro_rules! expect_type { if $expected != "any" && actual != "any" && actual != $expected { return error!( $loc, - format!("expected type '{}', got '{}'", $expected, actual) + format!("expected type '{}', got {}", $expected, actual) ); } }}; @@ -24,7 +24,7 @@ macro_rules! expect_types { return error!( $loc, format!( - "expected one of [{}], got '{}'", + "expected one of [{}], got {}", [$( $expected ),+].join(", "), $expr_type )