diff options
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/bin/br.rs | 8 |
3 files changed, 10 insertions, 4 deletions
@@ -62,8 +62,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bedrock-asm" -version = "4.0.1" -source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.1#2cd0c86659479774d092de727e0f0c31e27e49f2" +version = "4.0.2" +source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.2#398904776672a8e2143cca8b8953b15e37ff2c53" dependencies = [ "vagabond", "xflags", @@ -6,7 +6,7 @@ edition = "2021" description = "Emulator for running Bedrock programs" [dependencies] -bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.1" } +bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.2" } bedrock-core = { git = "git://benbridle.com/bedrock_core", tag = "v5.0.0" } phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.1.0" } geometry = { git = "git://benbridle.com/geometry", tag = "v1.0.0" } diff --git a/src/bin/br.rs b/src/bin/br.rs index ed101de..d9d792f 100644 --- a/src/bin/br.rs +++ b/src/bin/br.rs @@ -265,7 +265,13 @@ fn main_asm(args: Asm) { if print_resolver_errors(&resolver) { std::process::exit(1); }; - let merged_source = resolver.get_merged_source_code(); + let merged_source = match resolver.get_merged_source_code() { + Ok(merged_source) => merged_source, + Err(ids) => { + print_cyclic_source_units(&ids, &resolver); + std::process::exit(1); + }, + }; if args.resolve && !args.check { write_bytes_and_exit(merged_source.as_bytes(), args.output.as_ref()); } |