intercal/rasp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start using 'symbol' in favor of 'name' or 'label'

Browse Source 
Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
This commit is contained in:
Alek Ratzloff
2020-02-09 13:12:56 -05:00
parent e198da5825
commit 1c16be650a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vm/obj/assemble/error.rs
View File

@@ -9,11 +9,13 @@ pub enum AssembleError {
#[snafu(display("IO error: {}", source))] #[snafu(display("IO error: {}", source))]
Io { source: io::Error }, Io { source: io::Error },
#[snafu(display("duplicate symbol name: {}", name))] #[snafu(display("duplicate symbol name: {}", name))]
DuplicateName { name: String }, DuplicateSymbol { name: String },
#[snafu(display("duplicate exported symbol name: {}", name))] #[snafu(display("duplicate exported symbol name: {}", name))]
DuplicateExportName { name: String }, DuplicateExportSymbol { name: String },
} }
pub type Result<T, E = AssembleError> = std::result::Result<T, E>; pub type Result<T, E = AssembleError> = std::result::Result<T, E>;

4
src/vm/obj/assemble/mod.rs
View File

@@ -49,7 +49,7 @@ impl<'a> Assemble<'a> {
let export_keys = exports.keys().collect::<HashSet<&String>>(); let export_keys = exports.keys().collect::<HashSet<&String>>();
let global_keys = self.symbols.globals().keys().collect::<HashSet<&String>>(); let global_keys = self.symbols.globals().keys().collect::<HashSet<&String>>();
if let Some(key) = export_keys.intersection(&global_keys).next() { if let Some(key) = export_keys.intersection(&global_keys).next() {
return Err(AssembleError::DuplicateExportName { return Err(AssembleError::DuplicateExportSymbol {
name: key.to_string(), name: key.to_string(),
}); });
} }
@@ -134,7 +134,7 @@ impl<'a> Assemble<'a> {
} }
Line::LabelDef(label) => { Line::LabelDef(label) => {
if labels.contains_key(label) { if labels.contains_key(label) {
return Err(AssembleError::DuplicateName { return Err(AssembleError::DuplicateSymbol {
name: label.to_string(), name: label.to_string(),
}); });
} else { } else {