employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

TAMER: ld/poc: Simplify {get_interner_value=>get_ident}

master
Mike Gerwitz 2020-03-13 01:19:43 -04:00
parent 400d5b25a1
commit 3fe3fc4b84
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tamer/src/ld/poc.rs
View File

@ -238,18 +238,14 @@ fn load_xmlo<'a, 'i, I: Interner<'i>>(
}
}
fn get_interner_value<'a, 'i, I: Interner<'i>>(
fn get_ident<'a, 'i>(
depgraph: &'a LinkerAsg<'i>,
interner: &'i I,
name: &str,
) -> Result<&'a Object<'i>, Box<dyn Error>> {
match depgraph.lookup(interner.intern(name)) {
Some(frag) => match depgraph.get(frag) {
Some(result) => Ok(result),
None => Err(XmloError::MissingFragment(String::from(name)).into()),
},
None => Err(XmloError::MissingFragment(String::from(name)).into()),
}
name: &'i Symbol<'i>,
) -> Result<&'a Object<'i>, XmloError> {
depgraph
.lookup(name)
.and_then(|id| depgraph.get(id))
.ok_or(XmloError::MissingFragment(String::from(name as &str)))
}
fn output_xmle<'a, 'i, I: Interner<'i>>(
@ -261,28 +257,22 @@ fn output_xmle<'a, 'i, I: Interner<'i>>(
output: &str,
) -> Result<(), Box<dyn Error>> {
if !sorted.map.is_empty() {
sorted.map.push_head(get_interner_value(
depgraph,
interner,
&String::from(":map:___head"),
)?);
sorted.map.push_tail(get_interner_value(
depgraph,
interner,
&String::from(":map:___tail"),
)?);
sorted
.map
.push_head(get_ident(depgraph, interner.intern(":map:___head"))?);
sorted
.map
.push_tail(get_ident(depgraph, interner.intern(":map:___tail"))?);
}
if !sorted.retmap.is_empty() {
sorted.retmap.push_head(get_interner_value(
sorted.retmap.push_head(get_ident(
depgraph,
interner,
&String::from(":retmap:___head"),
interner.intern(":retmap:___head"),
)?);
sorted.retmap.push_tail(get_interner_value(
sorted.retmap.push_tail(get_ident(
depgraph,
interner,
&String::from(":retmap:___tail"),
interner.intern(":retmap:___tail"),
)?);
}