diff --git a/src/vm/obj/assemble/error.rs b/src/vm/obj/assemble/error.rs index 58a1737..e744abc 100644 --- a/src/vm/obj/assemble/error.rs +++ b/src/vm/obj/assemble/error.rs @@ -9,11 +9,13 @@ pub enum AssembleError { #[snafu(display("IO error: {}", source))] Io { source: io::Error }, + + #[snafu(display("duplicate symbol name: {}", name))] - DuplicateName { name: String }, + DuplicateSymbol { name: String }, #[snafu(display("duplicate exported symbol name: {}", name))] - DuplicateExportName { name: String }, + DuplicateExportSymbol { name: String }, } pub type Result = std::result::Result; diff --git a/src/vm/obj/assemble/mod.rs b/src/vm/obj/assemble/mod.rs index 48d6687..01bb26f 100644 --- a/src/vm/obj/assemble/mod.rs +++ b/src/vm/obj/assemble/mod.rs @@ -49,7 +49,7 @@ impl<'a> Assemble<'a> { let export_keys = exports.keys().collect::>(); let global_keys = self.symbols.globals().keys().collect::>(); if let Some(key) = export_keys.intersection(&global_keys).next() { - return Err(AssembleError::DuplicateExportName { + return Err(AssembleError::DuplicateExportSymbol { name: key.to_string(), }); } @@ -134,7 +134,7 @@ impl<'a> Assemble<'a> { } Line::LabelDef(label) => { if labels.contains_key(label) { - return Err(AssembleError::DuplicateName { + return Err(AssembleError::DuplicateSymbol { name: label.to_string(), }); } else {